[Cmake-commits] CMake branch, next, updated. v2.8.2-426-g2e65a1f

[Marcus D. Hanwell]

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  2e65a1fa543e4e148eccfab4d99287c9b1bf386a (commit)
       via  42fd9a596fdc300855f5c8d2f755c0a2181ffd34 (commit)
      from  bd68e735a6e0465b7e4b6ccb82ce60a0bca47d19 (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=2e65a1fa543e4e148eccfab4d99287c9b1bf386a
commit 2e65a1fa543e4e148eccfab4d99287c9b1bf386a
Merge: bd68e73 42fd9a5
Author:     Marcus D. Hanwell <marcus.hanwell at kitware.com>
AuthorDate: Fri Aug 13 15:00:54 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 13 15:00:54 2010 -0400

    Merge topic 'python_add_module_scope' into next
    
    42fd9a5 Bug with default library type of Python modules.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42fd9a596fdc300855f5c8d2f755c0a2181ffd34
commit 42fd9a596fdc300855f5c8d2f755c0a2181ffd34
Author:     Marcus D. Hanwell <marcus.hanwell at kitware.com>
AuthorDate: Fri Aug 13 14:49:29 2010 -0400
Commit:     Marcus D. Hanwell <marcus.hanwell at kitware.com>
CommitDate: Fri Aug 13 14:49:29 2010 -0400

    Bug with default library type of Python modules.
    
    The _TARGET_SUPPORTS_SHARED_LIBS variable was being altered outside of
    the find module, moving it into the function fixes any of these scoping
    issues. Fix tested and verified in VTK and Titan.

diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index 423d5dd..d12f14a 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -105,11 +105,9 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibs DEFAULT_MSG PYTHON_LIBRARIES PYTHON
 # PYTHON_ADD_MODULE(<name> src1 src2 ... srcN) is used to build modules for python.
 # PYTHON_WRITE_MODULES_HEADER(<filename>) writes a header file you can include 
 # in your sources to initialize the static python modules
-
-GET_PROPERTY(_TARGET_SUPPORTS_SHARED_LIBS
-  GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS)
-
 FUNCTION(PYTHON_ADD_MODULE _NAME )
+  GET_PROPERTY(_TARGET_SUPPORTS_SHARED_LIBS
+    GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS)
   OPTION(PYTHON_ENABLE_MODULE_${_NAME} "Add module ${_NAME}" TRUE)
   OPTION(PYTHON_MODULE_${_NAME}_BUILD_SHARED
     "Add module ${_NAME} shared" ${_TARGET_SUPPORTS_SHARED_LIBS})

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

Summary of changes:
 Modules/FindPythonLibs.cmake |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake