[Cmake-commits] CMake branch, next, updated. v3.0.0-3956-ge124a81

[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  e124a8106e905a18dde38f8e762764db4a3f4341 (commit)
       via  ae8498d9c20aae1fa1967c8248c4aba0b4f41b5f (commit)
      from  a1b18e1810df198994634d6fbcb60244f7574183 (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=e124a8106e905a18dde38f8e762764db4a3f4341
commit e124a8106e905a18dde38f8e762764db4a3f4341
Merge: a1b18e1 ae8498d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 25 13:55:57 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 25 13:55:57 2014 -0400

    Merge topic 'UseSWIG-fix-noproxy-check' into next
    
    ae8498d9 UseSWIG: Fix check for noproxy flag (#14990)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae8498d9c20aae1fa1967c8248c4aba0b4f41b5f
commit ae8498d9c20aae1fa1967c8248c4aba0b4f41b5f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 25 13:52:52 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 25 13:54:21 2014 -0400

    UseSWIG: Fix check for noproxy flag (#14990)
    
    The check for this flag added by commit v3.0.0-rc1~284^2 (UseSWIG: Name
    python module according to swig flags, 2013-11-26) can get false
    positives on flags like "-noproxydel".  Improve the check to match only
    "-noproxy".
    
    Suggested-by: Garth Wells <gnw20 at cam.ac.uk>

diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 918e2ec..31ab48d 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -73,7 +73,7 @@ macro(SWIG_MODULE_INITIALIZE name language)
   set(SWIG_MODULE_${name}_SWIG_LANGUAGE_FLAG "${swig_lowercase_language}")
 
   set(SWIG_MODULE_${name}_REAL_NAME "${name}")
-  if (CMAKE_SWIG_FLAGS MATCHES "-noproxy")
+  if (";${CMAKE_SWIG_FLAGS};" MATCHES ";-noproxy;")
     set (SWIG_MODULE_${name}_NOPROXY TRUE)
   endif ()
   if("${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "UNKNOWN")

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

Summary of changes:
 Modules/UseSWIG.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake