[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5677-g9a5e701

[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, next has been updated
       via  9a5e701af67b5cfa82c52528814bcce253904b72 (commit)
       via  19b7a54d351f41a9e92d46a9e13911a0b0b223bb (commit)
      from  8919009fc08aa5d715f32445b724867dbad8b7d7 (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=9a5e701af67b5cfa82c52528814bcce253904b72
commit 9a5e701af67b5cfa82c52528814bcce253904b72
Merge: 8919009 19b7a54
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 22 09:13:08 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 22 09:13:08 2013 -0500

    Merge topic 'FindSWIG-fix13449' into next
    
    19b7a54 FindSWIG: Search for swig.swg only on host (#13449)


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

    FindSWIG: Search for swig.swg only on host (#13449)
    
    Use NO_CMAKE_FIND_ROOT_PATH to ensure swig.swg can be found on the host
    even when cross-compiling.

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:


hooks/post-receive
-- 
CMake