[cmake-commits] king committed CPackDeb.cmake 1.7 1.8 FeatureSummary.cmake 1.2 1.3 FindPythonLibs.cmake 1.40 1.41

cmake-commits at cmake.org cmake-commits at cmake.org
Thu Jan 17 17:19:15 EST 2008


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

Modified Files:
	CPackDeb.cmake FeatureSummary.cmake FindPythonLibs.cmake 
Log Message:
ENH: Changed signature of GET_PROPERTY command to be more powerful and extendible.


Index: FindPythonLibs.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPythonLibs.cmake,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- FindPythonLibs.cmake	18 Sep 2007 19:13:22 -0000	1.40
+++ FindPythonLibs.cmake	17 Jan 2008 22:19:13 -0000	1.41
@@ -93,7 +93,8 @@
   SET(PY_MODULES_LIST        "" CACHE STRING "Collect a list of all added python modules" FORCE)
 ENDIF(NOT _FIND_PYTHONLIBS_ALREADY_INCLUDED)
 
-GET_PROPERTY(_TARGET_SUPPORTS_SHARED_LIBS GLOBAL TARGET_SUPPORTS_SHARED_LIBS)
+GET_PROPERTY(_TARGET_SUPPORTS_SHARED_LIBS
+  GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS)
 
 MACRO(PYTHON_ADD_MODULE _NAME )
   OPTION(PYTHON_ENABLE_MODULE_${_NAME} "Add module ${_NAME}" TRUE)

Index: FeatureSummary.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FeatureSummary.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FeatureSummary.cmake	17 Jan 2008 20:54:49 -0000	1.2
+++ FeatureSummary.cmake	17 Jan 2008 22:19:13 -0000	1.3
@@ -33,18 +33,18 @@
 
 MACRO(_PRINT_FEATURES _property _text)
   SET(_currentFeatureText "${_text}")
-  GET_PROPERTY(_EnabledFeatures  GLOBAL  ${_property})
+  GET_PROPERTY(_EnabledFeatures  GLOBAL PROPERTY ${_property})
   FOREACH(_currentFeature ${_EnabledFeatures})
     SET(_currentFeatureText "${_currentFeatureText}\n${_currentFeature}")
-    GET_PROPERTY(_info  GLOBAL  ${_currentFeature}_DESCRIPTION)
+    GET_PROPERTY(_info  GLOBAL PROPERTY ${_currentFeature}_DESCRIPTION)
     IF(_info)
       SET(_currentFeatureText "${_currentFeatureText} , ${_info}")
     ENDIF(_info)
-    GET_PROPERTY(_info  GLOBAL  ${_currentFeature}_URL)
+    GET_PROPERTY(_info  GLOBAL PROPERTY ${_currentFeature}_URL)
     IF(_info)
       SET(_currentFeatureText "${_currentFeatureText} , <${_info}>")
     ENDIF(_info)
-    GET_PROPERTY(_info  GLOBAL  ${_currentFeature}_COMMENT)
+    GET_PROPERTY(_info  GLOBAL PROPERTY ${_currentFeature}_COMMENT)
     IF(_info)
       SET(_currentFeatureText "${_currentFeatureText} , ${_info}")
     ENDIF(_info)

Index: CPackDeb.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPackDeb.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- CPackDeb.cmake	25 Oct 2007 17:26:52 -0000	1.7
+++ CPackDeb.cmake	17 Jan 2008 22:19:13 -0000	1.8
@@ -39,8 +39,8 @@
   SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386)
 ENDIF(NOT CPACK_DEBIAN_PACKAGE_ARCHITECTURE)
 
-# have a look at GET_PROPERTY(result GLOBAL ENABLED_FEATURES), this returns 
-# the successful FIND_PACKAGE() calls, maybe this can help
+# have a look at GET_PROPERTY(result GLOBAL PROPERTY ENABLED_FEATURES),
+# this returns the successful FIND_PACKAGE() calls, maybe this can help
 # Depends:
 IF(NOT CPACK_DEBIAN_PACKAGE_DEPENDS)
   MESSAGE(STATUS "CPACK_DEBIAN_PACKAGE_DEPENDS not set, the package will have no dependencies.")



More information about the Cmake-commits mailing list