[cmake-commits] alex committed FindPythonLibs.cmake 1.29 1.30

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv11640

Modified Files:
	FindPythonLibs.cmake 
Log Message:

ENH: only load the static modules in the LoadAll function

Alex


Index: FindPythonLibs.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPythonLibs.cmake,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- FindPythonLibs.cmake	19 Jul 2007 13:00:51 -0000	1.29
+++ FindPythonLibs.cmake	19 Jul 2007 14:20:21 -0000	1.30
@@ -94,11 +94,12 @@
       SET(PY_MODULE_TYPE MODULE)
     ELSE(PYTHON_MODULE_${_NAME}_SHARED)
       SET(PY_MODULE_TYPE STATIC)
+      SET(PY_STATIC_MODULES_LIST  ${PY_STATIC_MODULES_LIST} ${_NAME})
     ENDIF(PYTHON_MODULE_${_NAME}_SHARED)
 
     SET(PY_MODULES_LIST  ${PY_MODULES_LIST} ${_NAME})
     ADD_LIBRARY(${_NAME} ${PY_MODULE_TYPE} ${ARGN})
-    TARGET_LINK_LIBRARIES(${_NAME} ${PYTHON_LIBRARIES})
+#    TARGET_LINK_LIBRARIES(${_NAME} ${PYTHON_LIBRARIES})
   ENDIF(PYTHON_ENABLE_MODULE_${_NAME})
 ENDMACRO(PYTHON_ADD_MODULE)
 
@@ -120,8 +121,8 @@
   ENDFOREACH(_currentModule ${PY_MODULES_LIST})
 
   FILE(APPEND ${_filename} "#ifndef EXCLUDE_LOAD_ALL_FUNCTION\nvoid CMakeLoadAllPythonModules(void)\n{\n")
-  FOREACH(_currentModule ${PY_MODULES_LIST})
+  FOREACH(_currentModule ${PY_STATIC_MODULES_LIST})
     FILE(APPEND ${_filename} "  CMakeLoadPythonModule_${_currentModule}();\n")
-  ENDFOREACH(_currentModule ${PY_MODULES_LIST})
+  ENDFOREACH(_currentModule ${PY_STATIC_MODULES_LIST})
   FILE(APPEND ${_filename} "}\n#endif\n\n#endif\n")
 ENDMACRO(PYTHON_WRITE_MODULES_HEADER)