[Orxonox-commit 3588] r8273 - code/branches/kicklib/cmake

rgrieder at orxonox.net rgrieder at orxonox.net
Wed Apr 20 04:01:13 CEST 2011


Author: rgrieder
Date: 2011-04-20 04:01:12 +0200 (Wed, 20 Apr 2011)
New Revision: 8273

Modified:
   code/branches/kicklib/cmake/PackageConfig.cmake
Log:
Added optional use of install_manifest.txt file (white space separated list) in the dependency binary directory to specify the files to be installed for a release configuration.

Modified: code/branches/kicklib/cmake/PackageConfig.cmake
===================================================================
--- code/branches/kicklib/cmake/PackageConfig.cmake	2011-04-19 22:29:08 UTC (rev 8272)
+++ code/branches/kicklib/cmake/PackageConfig.cmake	2011-04-20 02:01:12 UTC (rev 8273)
@@ -74,12 +74,23 @@
   )
 
   ## RELEASE
-  # Try to filter out all the debug libraries. If the regex doesn't do the
-  # job anymore, simply adjust it.
-  INSTALL(
-    DIRECTORY ${DEP_BINARY_DIR}/
-    DESTINATION bin
-    CONFIGURATIONS Release RelWithDebInfo MinSizeRel
-    REGEX "_[Dd]\\.[a-zA-Z0-9+-]+$|-mt-gd-|^.*\\.pdb$" EXCLUDE
-  )
+  IF(EXISTS ${DEP_BINARY_DIR}/install_manifest.txt)
+    FILE(STRINGS ${DEP_BINARY_DIR}/install_manifest.txt _files)
+    FOREACH(_file ${_files})
+      INSTALL(
+        FILES ${DEP_BINARY_DIR}/${_file}
+        DESTINATION bin
+        CONFIGURATIONS Release RelWithDebInfo MinSizeRel
+      )
+    ENDFOREACH(_file)
+  ELSE()
+    # Try to filter out all the debug libraries. If the regex doesn't do the
+    # job anymore, simply adjust it.
+    INSTALL(
+      DIRECTORY ${DEP_BINARY_DIR}/
+      DESTINATION bin
+      CONFIGURATIONS Release RelWithDebInfo MinSizeRel
+      REGEX "_[Dd]\\.[a-zA-Z0-9+-]+$|-mt-gd-|^.*\\.pdb$" EXCLUDE
+    )
+  ENDIF()
 ENDIF()




More information about the Orxonox-commit mailing list