Changeset 2631

Timestamp:

Feb 2, 2009, 1:27:18 PM (16 years ago)

Author:

rgrieder

Message:

Exported package configuration to the dependencies folder.
LibraryConfig.cmake now includes all PackageConfig*.cmake files in the dependency folder, which then configure the library paths.

Location:

code/branches/buildsystem2/cmake

Files:

• FindPackageHandleAdvancedArgs.cmake (modified) (1 diff)
• LibraryConfig.cmake (modified) (1 diff)
• LibraryConfigMSVC.cmake (deleted)
• LibraryConfigMinGW.cmake (deleted)

code/branches/buildsystem2/cmake/FindPackageHandleAdvancedArgs.cmake

@@ -38 +38 @@
   ENDIF()
   IF(${_name}_FIND_VERSION_EXACT)
-    SET(_fail_msg_adv "${_fail_msg_adv} (version requirements: exactly ${${_name}_FIND_VERSION}")
+    SET(_fail_msg_adv "${_fail_msg_adv} (version requirements: exactly ${${_name}_FIND_VERSION})")
   ELSE()
-    SET(_fail_msg_adv "${_fail_msg_adv} (version requirements: at least ${${_name}_FIND_VERSION}")
+    SET(_fail_msg_adv "${_fail_msg_adv} (version requirements: at least ${${_name}_FIND_VERSION})")
   ENDIF()
   FIND_PACKAGE_HANDLE_STANDARD_ARGS("${_name}" "${_fail_msg_adv}" ${ARGN})

code/branches/buildsystem2/cmake/LibraryConfig.cmake

@@ -29 +29 @@
 INCLUDE(FindPackageHandleStandardArgs)
 
-################ Misc Options ###################
+############## Platform Scripts #################
 
-OPTION(LIBRARY_USE_PACKAGE_IF_SUPPORTED
-       "When set to false CMake will only look in the standard paths for libraries" ON)
-
-
-############## Platform Scripts #################
+# On Windows using a package causes way less problems
+SET(_option_msg "Set this to true to use precompiled dependecy archives")
+IF(WIN32)
+  OPTION(USE_DEPENDENCY_PACKAGE "${_option_msg}" ON)
+ELSE(WIN32)
+  OPTION(USE_DEPENDENCY_PACKAGE "${_option_msg}" FALSE)
+ENDIF(WIN32)
 
 # Scripts for specific library and CMake config
 INCLUDE(LibraryConfigTardis)
 INCLUDE(LibraryConfigApple)
-INCLUDE(LibraryConfigMSVC)
-INCLUDE(LibraryConfigMinGW)
+
+IF(USE_DEPENDENCY_PACKAGE)
+  IF(EXISTS ${CMAKE_SOURCE_DIR}/dependencies/include)
+    SET(DEPENDENCY_DIR "${CMAKE_SOURCE_DIR}/dependencies" CACHE PATH "")
+  ELSEIF(EXISTS ${CMAKE_SOURCE_DIR}/../dependencies/include)
+    SET(DEPENDENCY_DIR "${CMAKE_SOURCE_DIR}/../dependencies" CACHE PATH "")
+  ELSEIF(EXISTS ${CMAKE_SOURCE_DIR}/../lib_dist/dependencies/include)
+    SET(DEPENDENCY_DIR "${CMAKE_SOURCE_DIR}/../lib_dist/dependencies" CACHE PATH "")
+  ELSE()
+    MESSAGE(STATUS "Warning: Could not find dependency directory."
+                   "Disable LIBRARY_USE_PACKAGE if you have none intalled.")
+  ENDIF()
+  IF(DEPENDENCY_DIR)
+    FILE(GLOB _package_config_files dependencies/PackageConfig*.cmake)
+    FOREACH(_file ${_package_config_files})
+      INCLUDE(${_file})
+    ENDFOREACH(_file)
+  ENDIF()
+ENDIF(USE_DEPENDENCY_PACKAGE)
 
 # User script