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

[cmake-commits at cmake.org]

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

Modified Files:
	FindPythonLibs.cmake 
Log Message:

ENH: make the list of modules global

Alex


Index: FindPythonLibs.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPythonLibs.cmake,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- FindPythonLibs.cmake	19 Jul 2007 14:20:21 -0000	1.30
+++ FindPythonLibs.cmake	19 Jul 2007 15:47:23 -0000	1.31
@@ -85,6 +85,14 @@
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(PythonLibs PYTHON_LIBRARIES PYTHON_INCLUDE_PATH)
 
+
+GET_TARGET_PROPERTIES(_FIND_PYTHONLIBS_ALREADY_INCLUDED __FindPythonLibsHelper TYPE)
+IF(NOT _FIND_PYTHONLIBS_ALREADY_INCLUDED)
+  ADD_CUSTOM_TARGET(__FindPythonLibsHelper)  # so if this file is included several times the next time GET_TARGET_PROPERTIES() will work
+  SET(PY_STATIC_MODULES_LIST "" CACHE STRING "Collect a list of all added static python modules" FORCE)
+  SET(PY_MODULES_LIST        "" CACHE STRING "Collect a list of all added python modules" FORCE)
+ENDIF(NOT _FIND_PYTHONLIBS_ALREADY_INCLUDED)
+
 MACRO(PYTHON_ADD_MODULE _NAME )
   OPTION(PYTHON_ENABLE_MODULE_${_NAME} "Add module ${_NAME}" TRUE)
 
@@ -94,10 +102,10 @@
       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})
+      SET(PY_STATIC_MODULES_LIST  ${PY_STATIC_MODULES_LIST} ${_NAME} CACHE STRING "Collect a list of all added static python modules" FORCE)
     ENDIF(PYTHON_MODULE_${_NAME}_SHARED)
 
-    SET(PY_MODULES_LIST  ${PY_MODULES_LIST} ${_NAME})
+    SET(PY_MODULES_LIST  ${PY_MODULES_LIST} ${_NAME} CACHE STRING "Collect a list of all added python modules" FORCE)
     ADD_LIBRARY(${_NAME} ${PY_MODULE_TYPE} ${ARGN})
 #    TARGET_LINK_LIBRARIES(${_NAME} ${PYTHON_LIBRARIES})
   ENDIF(PYTHON_ENABLE_MODULE_${_NAME})