[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5810-g17baa9f

[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  17baa9f562374ec4fa46d6d9c693b15b209a1e00 (commit)
       via  6dfa23dce98f89600e1b8db51510b6181347e6d9 (commit)
      from  17abe549ce6d88cb6df518334648b50f07a87d19 (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=17baa9f562374ec4fa46d6d9c693b15b209a1e00
commit 17baa9f562374ec4fa46d6d9c693b15b209a1e00
Merge: 17abe54 6dfa23d
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Tue Nov 26 05:16:36 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 26 05:16:36 2013 -0500

    Merge topic 'UseSWIG-fix13318' into next
    
    6dfa23d Name python module according to swig flags.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6dfa23dce98f89600e1b8db51510b6181347e6d9
commit 6dfa23dce98f89600e1b8db51510b6181347e6d9
Author:     Julien Schueller <schueller at phimeca.com>
AuthorDate: Tue Nov 26 11:15:33 2013 +0100
Commit:     Julien Schueller <schueller at phimeca.com>
CommitDate: Tue Nov 26 11:15:33 2013 +0100

    Name python module according to swig flags.

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:
 Modules/UseSWIG.cmake |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake