[Cmake-commits] CMake branch, next, updated. v3.2.0-934-g9aec617

[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  9aec617f083d5b27041ba36d727763c5ae6efe37 (commit)
       via  458c9e95dee1f6c5a6e5b537a544a8a7c8c56d10 (commit)
      from  bd86df676c8b19c0f5a4e5d87c0074caf3ebcbe3 (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=9aec617f083d5b27041ba36d727763c5ae6efe37
commit 9aec617f083d5b27041ba36d727763c5ae6efe37
Merge: bd86df6 458c9e9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 9 16:35:22 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 9 16:35:22 2015 -0400

    Merge topic 'UseSWIG-fix-CMP0054-warnings' into next
    
    458c9e95 UseSWIG: Avoid if() auto-dereferene in quoted arguments


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=458c9e95dee1f6c5a6e5b537a544a8a7c8c56d10
commit 458c9e95dee1f6c5a6e5b537a544a8a7c8c56d10
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 9 16:32:43 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 9 16:35:08 2015 -0400

    UseSWIG: Avoid if() auto-dereferene in quoted arguments
    
    Protect against variables named "CSHARP", "PERL", "PYTHON", or "UNKNOWN"
    when CMP0054 is not set to NEW.
    
    Reported-by: Tuukka Pasanen <tuukka at iocaste.ilmi.fi>

diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index bab1b21..7939b1f 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -76,16 +76,16 @@ macro(SWIG_MODULE_INITIALIZE name language)
   if (";${CMAKE_SWIG_FLAGS};" MATCHES ";-noproxy;")
     set (SWIG_MODULE_${name}_NOPROXY TRUE)
   endif ()
-  if("${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "UNKNOWN")
+  if("x${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "xUNKNOWN")
     message(FATAL_ERROR "SWIG Error: Language \"${language}\" not found")
-  elseif("${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "PYTHON" AND NOT SWIG_MODULE_${name}_NOPROXY)
+  elseif("x${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "xPYTHON" AND NOT SWIG_MODULE_${name}_NOPROXY)
     # swig will produce a module.py containing an 'import _modulename' statement,
     # which implies having a corresponding _modulename.so (*NIX), _modulename.pyd (Win32),
     # unless the -noproxy flag is used
     set(SWIG_MODULE_${name}_REAL_NAME "_${name}")
-  elseif("${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "PERL")
+  elseif("x${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "xPERL")
     set(SWIG_MODULE_${name}_EXTRA_FLAGS "-shadow")
-  elseif("${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "CSHARP")
+  elseif("x${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "xCSHARP")
     # This makes sure that the name used in the generated DllImport
     # matches the library name created by CMake
     set(SWIG_MODULE_${name}_EXTRA_FLAGS "-dllimport;${name}")

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

Summary of changes:
 Modules/UseSWIG.cmake |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake