Changeset 2613 for code/branches/buildsystem2/cmake/HandleLibraryTypes.cmake

Timestamp:

Jan 29, 2009, 10:19:15 PM (15 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).

File:

• code/branches/buildsystem2/cmake/HandleLibraryTypes.cmake (modified) (1 diff)

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)