[Cmake-commits] CMake branch, next, updated. v2.8.2-921-gb319e46

[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  b319e4621ecffc82e9784a8e6a2295403059ecef (commit)
       via  d36c16a7609d3329dc32ae800570a0a06dea628e (commit)
      from  e3279afebeb6ed4aa3b11b3506e9b3ad21250185 (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=b319e4621ecffc82e9784a8e6a2295403059ecef
commit b319e4621ecffc82e9784a8e6a2295403059ecef
Merge: e3279af d36c16a
Author:     Marcus D. Hanwell <marcus.hanwell at kitware.com>
AuthorDate: Fri Sep 24 15:07:07 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 24 15:07:07 2010 -0400

    Merge topic 'python_module_prefix_suffix' into next
    
    d36c16a Set the module prefix, updated Windows suffix.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d36c16a7609d3329dc32ae800570a0a06dea628e
commit d36c16a7609d3329dc32ae800570a0a06dea628e
Author:     David Gobbi <david.gobbi at gmail.com>
AuthorDate: Fri Sep 24 15:04:24 2010 -0400
Commit:     Marcus D. Hanwell <marcus.hanwell at kitware.com>
CommitDate: Fri Sep 24 15:04:24 2010 -0400

    Set the module prefix, updated Windows suffix.
    
    Set the Python module prefix to PYTHON_MODULE_PREFIX, and changed the
    suffix on Windows to .pyd as .dll is officially deprecated.

diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
index d12f14a..283c914 100644
--- a/Modules/FindPythonLibs.cmake
+++ b/Modules/FindPythonLibs.cmake
@@ -128,6 +128,13 @@ FUNCTION(PYTHON_ADD_MODULE _NAME )
     ADD_LIBRARY(${_NAME} ${PY_MODULE_TYPE} ${ARGN})
 #    TARGET_LINK_LIBRARIES(${_NAME} ${PYTHON_LIBRARIES})
 
+    IF(PYTHON_MODULE_${_NAME}_BUILD_SHARED)
+      SET_TARGET_PROPERTIES(${_NAME} PROPERTIES PREFIX "${PYTHON_MODULE_PREFIX}")
+      IF(WIN32 AND NOT CYGWIN)
+        SET_TARGET_PROPERTIES(${_NAME} PROPERTIES SUFFIX ".pyd")
+      ENDIF(WIN32 AND NOT CYGWIN)
+    ENDIF(PYTHON_MODULE_${_NAME}_BUILD_SHARED)
+
   ENDIF(PYTHON_ENABLE_MODULE_${_NAME})
 ENDFUNCTION(PYTHON_ADD_MODULE)
 

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

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


hooks/post-receive
-- 
CMake