[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5662-g6778c2f

[Julien Schueller]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  6778c2fae69425d0acb6748b4893a017d245f420 (commit)
       via  9d2437a655a302caf829dc06d8a17bd1b0d134b2 (commit)
      from  835b59e5842168fe92e78bde7c4db7676fbced33 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6778c2fae69425d0acb6748b4893a017d245f420
commit 6778c2fae69425d0acb6748b4893a017d245f420
Merge: 835b59e 9d2437a
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Fri Nov 22 02:12:52 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 22 02:12:52 2013 -0500

    Merge topic 'FindSWIG-fix13771' into next
    
    9d2437a Use CMAKE_CURRENT_LIST_DIR instead of CMAKE_ROOT, fixes #0013771

diff --cc Modules/FindSWIG.cmake
index f27c990,724ddcc..55f4c0d
--- a/Modules/FindSWIG.cmake
+++ b/Modules/FindSWIG.cmake
@@@ -54,9 -54,9 +54,9 @@@ if(SWIG_EXECUTABLE
      string(REGEX REPLACE "[\n\r]+" ";" SWIG_swiglib_output ${SWIG_swiglib_output})
      # force the path to be computed each time in case SWIG_EXECUTABLE has changed.
      set(SWIG_DIR SWIG_DIR-NOTFOUND)
 -    find_path(SWIG_DIR swig.swg PATHS ${SWIG_swiglib_output})
 +    find_path(SWIG_DIR swig.swg PATHS ${SWIG_swiglib_output} NO_CMAKE_FIND_ROOT_PATH)
      if(SWIG_DIR)
-       set(SWIG_USE_FILE ${CMAKE_ROOT}/Modules/UseSWIG.cmake)
+       set(SWIG_USE_FILE ${CMAKE_CURRENT_LIST_DIR}/UseSWIG.cmake)
        execute_process(COMMAND ${SWIG_EXECUTABLE} -version
          OUTPUT_VARIABLE SWIG_version_output
          ERROR_VARIABLE SWIG_version_output

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d2437a655a302caf829dc06d8a17bd1b0d134b2
commit 9d2437a655a302caf829dc06d8a17bd1b0d134b2
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Thu Nov 21 14:50:21 2013 +0100
Commit:     Julien Schueller <schueller at phimeca.com>
CommitDate: Thu Nov 21 14:50:21 2013 +0100

    Use CMAKE_CURRENT_LIST_DIR instead of CMAKE_ROOT, fixes #0013771

diff --git a/Modules/FindSWIG.cmake b/Modules/FindSWIG.cmake
index bb78bc2..724ddcc 100644
--- a/Modules/FindSWIG.cmake
+++ b/Modules/FindSWIG.cmake
@@ -56,7 +56,7 @@ if(SWIG_EXECUTABLE)
     set(SWIG_DIR SWIG_DIR-NOTFOUND)
     find_path(SWIG_DIR swig.swg PATHS ${SWIG_swiglib_output})
     if(SWIG_DIR)
-      set(SWIG_USE_FILE ${CMAKE_ROOT}/Modules/UseSWIG.cmake)
+      set(SWIG_USE_FILE ${CMAKE_CURRENT_LIST_DIR}/UseSWIG.cmake)
       execute_process(COMMAND ${SWIG_EXECUTABLE} -version
         OUTPUT_VARIABLE SWIG_version_output
         ERROR_VARIABLE SWIG_version_output

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindSWIG.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake