Changeset 2613

Timestamp:

Jan 29, 2009, 10:19:15 PM (16 years ago)

Author:

rgrieder

Message:

• Added FindPackageHandleAdvancedArgs.cmake module that invokes FindPackageHandleStandardArgs and then checks the version requirements. Usage: FIND_PACKAGE_HANDLE_ADVANCED_ARGS(NAME MSG VERSION VARS) (like the orginal CMake module, but with the additional version argument)
• Updated DetermineVersion.cmake and HandleLibraryTypes.cmake to use FUNCTION instead of MACRO and also removed CACHE setting of the veriables (unnecessary).

Location:

code/branches/buildsystem2/cmake

Files:

• DetermineVersion.cmake (modified) (2 diffs)
• FindPackageHandleAdvancedArgs.cmake (added)
• HandleLibraryTypes.cmake (modified) (1 diff)

code/branches/buildsystem2/cmake/DetermineVersion.cmake

@@ -17 +17 @@
 #    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
-MACRO(DETERMINE_VERSION _name _file)
-  FILE(READ ${_file} _file_content)
-  IF(_file_content)
+FUNCTION(DETERMINE_VERSION _name _file)
+  IF(EXISTS ${_file})
+    FILE(READ ${_file} _file_content)
     SET(_parts ${ARGN})
     LIST(LENGTH _parts _parts_length)
@@ -29 +29 @@
       STRING(REGEX MATCH "${_name}_VERSION_${_part} +([0-9]+)" _match ${_file_content})
       IF(_match)
-        SET(${_name}_VERSION_${_part} ${CMAKE_MATCH_1} CACHE STRING "")
+        SET(${_name}_VERSION_${_part} ${CMAKE_MATCH_1})
+        SET(${_name}_VERSION_${_part} ${CMAKE_MATCH_1} PARENT_SCOPE)
       ELSE(_match)
-        SET(${_name}_VERSION_${_part} "0" CACHE STRING "")
+        SET(${_name}_VERSION_${_part} "0")
+        SET(${_name}_VERSION_${_part} "0" PARENT_SCOPE)
       ENDIF(_match)
-      MARK_AS_ADVANCED(${_name}_VERSION_${_part})
       IF("${_parts}" MATCHES "^${_part}") # First?
-        SET(${_name}_VERSION "${${_name}_VERSION_${_part}}" CACHE STRING "" FORCE)
+        SET(${_name}_VERSION "${${_name}_VERSION_${_part}}")
       ELSE("${_parts}" MATCHES "^${_part}")
-        SET(${_name}_VERSION "${${_name}_VERSION}.${${_name}_VERSION_${_part}}" CACHE STRING "" FORCE)
+        SET(${_name}_VERSION "${${_name}_VERSION}.${${_name}_VERSION_${_part}}")
       ENDIF("${_parts}" MATCHES "^${_part}")
     ENDFOREACH(_part)
-    MARK_AS_ADVANCED(${_name}_VERSION)
-  ENDIF(_file_content)
-ENDMACRO(DETERMINE_VERSION)
+    SET(${_name}_VERSION "${${_name}_VERSION}" PARENT_SCOPE)
+  ENDIF(EXISTS ${_file})
+ENDFUNCTION(DETERMINE_VERSION)

code/branches/buildsystem2/cmake/HandleLibraryTypes.cmake

@@ -26 +26 @@
  #
 
-MACRO(HandleLibraryTypes _name)
+FUNCTION(HANDLE_LIBRARY_TYPES _name)
   # Additional libraries can be added as additional arguments
-  IF(${_name}_FOUND)
-    IF(${_name}_LIBRARY_DEBUG)
-      SET(${_name}_LIBRARY
-          optimized ${${_name}_LIBRARY_OPTIMIZED} ${ARGN}
-          debug     ${${_name}_LIBRARY_DEBUG}     ${ARGN}
-          CACHE STRING "${_name} library file(s)" FORCE
-      )
-    ELSE(${_name}_LIBRARY_DEBUG)
-      SET(${_name}_LIBRARY
-          ${${_name}_LIBRARY_OPTIMIZED} ${ARGN}
-          CACHE STRING "${_name} library file(s)" FORCE
-      )
-    ENDIF(${_name}_LIBRARY_DEBUG)
-  ENDIF(${_name}_FOUND)
-ENDMACRO(HandleLibraryTypes)
+  IF(${_name}_LIBRARY_DEBUG AND ${_name}_LIBRARY_OPTIMIZED)
+    SET(${_name}_LIBRARY
+      optimized ${${_name}_LIBRARY_OPTIMIZED} ${ARGN}
+      debug     ${${_name}_LIBRARY_DEBUG}     ${ARGN}
+      PARENT_SCOPE
+    )
+  ELSE(${_name}_LIBRARY_DEBUG AND ${_name}_LIBRARY_OPTIMIZED)
+    SET(${_name}_LIBRARY
+      ${${_name}_LIBRARY_OPTIMIZED} ${ARGN}
+      PARENT_SCOPE
+     )
+  ENDIF(${_name}_LIBRARY_DEBUG AND ${_name}_LIBRARY_OPTIMIZED)
+ENDFUNCTION(HANDLE_LIBRARY_TYPES)