[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5844-g83a37d7

[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  83a37d78c0580294d75568d7cfb7e9921904b036 (commit)
       via  a87c06328c4c836918216863c475beabf10d6c2d (commit)
      from  d86cac8a3c189ed65f0107c5116327f256d3a5d0 (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=83a37d78c0580294d75568d7cfb7e9921904b036
commit 83a37d78c0580294d75568d7cfb7e9921904b036
Merge: d86cac8 a87c063
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 26 09:47:16 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 26 09:47:16 2013 -0500

    Merge topic 'UseSWIG-fix13318' into next
    
    a87c063 UseSWIG: Name python module according to swig flags (#13318)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a87c06328c4c836918216863c475beabf10d6c2d
commit a87c06328c4c836918216863c475beabf10d6c2d
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Tue Nov 26 11:15:33 2013 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 26 09:46:39 2013 -0500

    UseSWIG: Name python module according to swig flags (#13318)

diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 4329053..30919ff 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -59,12 +59,15 @@ 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")
+    set (SWIG_MODULE_${name}_NOPROXY TRUE)
+  endif ()
   if("${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "UNKNOWN")
     message(FATAL_ERROR "SWIG Error: Language \"${language}\" not found")
-  elseif("${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "PYTHON")
-    # when swig is used without the -interface it will produce in the module.py
-    # a 'import _modulename' statement, which implies having a corresponding
-    # _modulename.so (*NIX), _modulename.pyd (Win32).
+  elseif("${SWIG_MODULE_${name}_LANGUAGE}" STREQUAL "PYTHON" 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")
     set(SWIG_MODULE_${name}_EXTRA_FLAGS "-shadow")

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

Summary of changes:


hooks/post-receive
-- 
CMake