[Cmake-commits] CMake branch, next, updated. v3.3.1-2802-g4df395d

[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  4df395dd4db45f1a40ada8ea84b6f92924b5bf5c (commit)
       via  96a8890c7d5c8fed7b5c48bc9640c94f8fd66761 (commit)
      from  3872a99e5d422e043c1da0572d2478d4756be60b (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=4df395dd4db45f1a40ada8ea84b6f92924b5bf5c
commit 4df395dd4db45f1a40ada8ea84b6f92924b5bf5c
Merge: 3872a99 96a8890
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 9 10:02:36 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 9 10:02:36 2015 -0400

    Merge topic 'FindSWIG-noproxy' into next
    
    96a8890c FindSWIG: Do not generate erroneous outputs with -noproxy


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96a8890c7d5c8fed7b5c48bc9640c94f8fd66761
commit 96a8890c7d5c8fed7b5c48bc9640c94f8fd66761
Author:     Ben Webb <ben at salilab.org>
AuthorDate: Fri Sep 4 14:33:37 2015 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 9 10:01:06 2015 -0400

    FindSWIG: Do not generate erroneous outputs with -noproxy
    
    Generally for a module foo, SWIG generates (in Python mode)
    an extension module _foo.so and a proxy Python module foo.py.
    However, if -noproxy is specified, instead it builds only foo.so
    (without the leading underscore). The custom command generated
    by CMake correctly handles the removal of this underscore when
    -noproxy is given; however, it still adds foo.py to the expected
    outputs. This upsets build tools that expect foo.py to be generated
    (for example, 'make' will run the SWIG command twice). Fix this
    by removing foo.py from the set of extra generated files when
    -noproxy is specified.

diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 96b0b35..d757f65 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -153,10 +153,12 @@ macro(SWIG_ADD_SOURCE_TO_MODULE name outfiles infile)
   else()
     set(swig_outdir ${CMAKE_CURRENT_BINARY_DIR})
   endif()
-  SWIG_GET_EXTRA_OUTPUT_FILES(${SWIG_MODULE_${name}_LANGUAGE}
-    swig_extra_generated_files
-    "${swig_outdir}"
-    "${swig_source_file_fullname}")
+  if (NOT SWIG_MODULE_${name}_NOPROXY)
+    SWIG_GET_EXTRA_OUTPUT_FILES(${SWIG_MODULE_${name}_LANGUAGE}
+      swig_extra_generated_files
+      "${swig_outdir}"
+      "${swig_source_file_fullname}")
+  endif()
   set(swig_generated_file_fullname
     "${swig_outdir}/${swig_source_file_name_we}")
   # add the language into the name of the file (i.e. TCL_wrap)

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

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


hooks/post-receive
-- 
CMake