[Cmake-commits] CMake branch, next, updated. v3.0.0-3958-gb071fb6

[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  b071fb689142fbbfc8aa1502d7e1059aa3bea4c7 (commit)
       via  e932ac9cadc2e87401be5c1fe57cfae1a80c8000 (commit)
      from  e124a8106e905a18dde38f8e762764db4a3f4341 (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=b071fb689142fbbfc8aa1502d7e1059aa3bea4c7
commit b071fb689142fbbfc8aa1502d7e1059aa3bea4c7
Merge: e124a81 e932ac9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 25 13:56:15 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 25 13:56:15 2014 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e932ac9cadc2e87401be5c1fe57cfae1a80c8000
commit e932ac9cadc2e87401be5c1fe57cfae1a80c8000
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:57:24 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 11ca205..f8eeef6 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -57,7 +57,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:


hooks/post-receive
-- 
CMake