[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5660-g835b59e

[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  835b59e5842168fe92e78bde7c4db7676fbced33 (commit)
       via  2558357de4f6599814c3036e5b35bd22de312e34 (commit)
      from  6f1630bb54a402a255dca78259fbbca9e16a4385 (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=835b59e5842168fe92e78bde7c4db7676fbced33
commit 835b59e5842168fe92e78bde7c4db7676fbced33
Merge: 6f1630b 2558357
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Fri Nov 22 02:12:33 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 22 02:12:33 2013 -0500

    Merge topic 'FindSWIG-fix13449' into next
    
    2558357 Do not try to find swig.swg in host tree, fixes #0013449.


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

    Do not try to find swig.swg in host tree, fixes #0013449.

diff --git a/Modules/FindSWIG.cmake b/Modules/FindSWIG.cmake
index bb78bc2..f7ad2f5 100644
--- a/Modules/FindSWIG.cmake
+++ b/Modules/FindSWIG.cmake
@@ -54,7 +54,7 @@ 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)
       execute_process(COMMAND ${SWIG_EXECUTABLE} -version

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

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


hooks/post-receive
-- 
CMake