[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5943-ga633dec

[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  a633dec1cb132bb1e47788d6738f4479f19b2644 (commit)
       via  5d3b0bb501aec34e452ddd1b140b90699d929621 (commit)
      from  8378ae956f86a693c9f6ec0e639e65822eb35e27 (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=a633dec1cb132bb1e47788d6738f4479f19b2644
commit a633dec1cb132bb1e47788d6738f4479f19b2644
Merge: 8378ae9 5d3b0bb
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Sat Nov 30 19:21:18 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Nov 30 19:21:18 2013 -0500

    Merge topic 'FindSWIG-3498' into next
    
    5d3b0bb FindSWIG: allow to provide SWIG_DIR (#3498)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d3b0bb501aec34e452ddd1b140b90699d929621
commit 5d3b0bb501aec34e452ddd1b140b90699d929621
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Sun Dec 1 01:20:46 2013 +0100
Commit:     Julien Schueller <schueller at phimeca.com>
CommitDate: Sun Dec 1 01:20:46 2013 +0100

    FindSWIG: allow to provide SWIG_DIR (#3498)

diff --git a/Modules/FindSWIG.cmake b/Modules/FindSWIG.cmake
index 55f4c0d..8bd4048 100644
--- a/Modules/FindSWIG.cmake
+++ b/Modules/FindSWIG.cmake
@@ -52,8 +52,6 @@ if(SWIG_EXECUTABLE)
     endif()
   else()
     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} NO_CMAKE_FIND_ROOT_PATH)
     if(SWIG_DIR)
       set(SWIG_USE_FILE ${CMAKE_CURRENT_LIST_DIR}/UseSWIG.cmake)

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

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


hooks/post-receive
-- 
CMake