[Cmake-commits] CMake branch, master, updated. v2.8.12.1-774-gf1d5d88

[Brad King]

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, master has been updated
       via  f1d5d889111f494b746aa0f0d5bba42cf1b5e61c (commit)
       via  8c127c9e33f051f4bf7389c3627a0978135e99fe (commit)
      from  adde0c6324fc7ac6f812f137b161e3a6f815108a (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=f1d5d889111f494b746aa0f0d5bba42cf1b5e61c
commit f1d5d889111f494b746aa0f0d5bba42cf1b5e61c
Merge: adde0c6 8c127c9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 25 08:37:53 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 25 08:37:53 2013 -0500

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

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

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

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


hooks/post-receive
-- 
CMake