[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5679-gda40915

Brad King brad.king at kitware.com
Fri Nov 22 09:13:21 EST 2013


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  da409153cc70c7ef278a7108a969c2ae866af123 (commit)
       via  8c127c9e33f051f4bf7389c3627a0978135e99fe (commit)
      from  9a5e701af67b5cfa82c52528814bcce253904b72 (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=da409153cc70c7ef278a7108a969c2ae866af123
commit da409153cc70c7ef278a7108a969c2ae866af123
Merge: 9a5e701 8c127c9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 22 09:13:15 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 22 09:13:15 2013 -0500

    Merge topic 'FindSWIG-fix13771' into next
    
    8c127c9 FindSWIG: Use CMAKE_CURRENT_LIST_DIR instead of CMAKE_ROOT (#13771)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c127c9e33f051f4bf7389c3627a0978135e99fe
commit 8c127c9e33f051f4bf7389c3627a0978135e99fe
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Thu Nov 21 14:50:21 2013 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Nov 22 09:10:51 2013 -0500

    FindSWIG: Use CMAKE_CURRENT_LIST_DIR instead of CMAKE_ROOT (#13771)
    
    This is a simpler way to reference the location of UseSWIG.cmake.

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:


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list