[Cmake-commits] CMake branch, next, updated. v3.7.0-1141-g647c3cd

[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  647c3cd2a114dd3c28cddc6b8e2b0ebd7b0b7431 (commit)
       via  d5b56dd15cd351ce678dc0edf63c72a49ffc5ae3 (commit)
      from  27c2222bf0c76a37656eb8a755fbe02e4c6a58e8 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=647c3cd2a114dd3c28cddc6b8e2b0ebd7b0b7431
commit 647c3cd2a114dd3c28cddc6b8e2b0ebd7b0b7431
Merge: 27c2222 d5b56dd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 14 14:51:31 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 14 14:51:31 2016 -0500

    Merge topic 'UseSWIG_USE_BUILD_SHARED_LIBS' into next
    
    d5b56dd1 UseSWIG: Add USE_BUILD_SHARED_LIBS to accepted values for the TYPE arg


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5b56dd15cd351ce678dc0edf63c72a49ffc5ae3
commit d5b56dd15cd351ce678dc0edf63c72a49ffc5ae3
Author:     Daniele E. Domenichelli <ddomenichelli at drdanz.it>
AuthorDate: Mon Nov 14 18:02:09 2016 +0100
Commit:     Daniele E. Domenichelli <ddomenichelli at drdanz.it>
CommitDate: Mon Nov 14 18:02:12 2016 +0100

    UseSWIG: Add USE_BUILD_SHARED_LIBS to accepted values for the TYPE arg
    
    The new signature is
    
      SWIG_ADD_LIBRARY(<name>
                       [TYPE <SHARED|MODULE|STATIC|USE_BUILD_SHARED_LIBS>]
                       LANGUAGE <language>
                       SOURCES <file>...
                       )

diff --git a/Modules/UseSWIG.cmake b/Modules/UseSWIG.cmake
index 0e00506..c5912f8 100644
--- a/Modules/UseSWIG.cmake
+++ b/Modules/UseSWIG.cmake
@@ -10,7 +10,7 @@
 # ::
 #
 #    SWIG_ADD_LIBRARY(<name>
-#                     [TYPE <SHARED|MODULE|STATIC>]
+#                     [TYPE <SHARED|MODULE|STATIC|USE_BUILD_SHARED_LIBS>]
 #                     LANGUAGE <language>
 #                     SOURCES <file>...
 #                     )
@@ -248,6 +248,8 @@ macro(SWIG_ADD_LIBRARY name)
 
   if(NOT DEFINED _SAM_TYPE)
     set(_SAM_TYPE MODULE)
+  elseif("${_SAM_TYPE}" STREQUAL "USE_BUILD_SHARED_LIBS")
+    unset(_SAM_TYPE)
   endif()
 
   swig_module_initialize(${name} ${_SAM_LANGUAGE})

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

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


hooks/post-receive
-- 
CMake