Changeset 2652 for code/branches/buildsystem2/cmake

Timestamp:

Feb 13, 2009, 10:16:19 AM (15 years ago)

Author:

rgrieder

Message:

• Using REGEX "…" EXCLCUDE in INSTALL avoids a call to FILE(GLOB) (quite slow) at CMake (instead of install) time
• Excluded audio target again (linker tests were successfull so far)
• Removed unexplainable code I once inserted in cpptcl.cc, didn't experience the problem anymore (was weird behaviour anyway)
• Sorting out some library depdencies (just a detail)

File:

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

code/branches/buildsystem2/cmake/LibraryConfig.cmake

@@ -69 +69 @@
       # When installing a debug version, we really can't know which libraries
       # are used in released mode because there might be deps of deps.
-      INSTALL(DIRECTORY ${DEP_BINARY_DIR}/ DESTINATION bin CONFIGURATIONS Debug)
+      INSTALL(
+        DIRECTORY ${DEP_BINARY_DIR}/
+        DESTINATION bin
+        CONFIGURATIONS Debug
+        REGEX "^.*\\.pdb$" EXCLUDE
+      )
 
       # Try to filter out all the debug libraries. If the regex doesn't do the
       # job anymore, simply adjust it.
-      FILE(GLOB _dependencies_all "${DEP_BINARY_DIR}/*")
-      FOREACH(_dep ${_dependencies_all})
-        IF(NOT _dep MATCHES "_[Dd]\\.[a-zA-Z0-9+-]+$|-mt-gd-|^.*\\.pdb$")
-          LIST(APPEND _dependencies_release "${_dep}")
-        ENDIF()
-      ENDFOREACH(_dep)
-      INSTALL(FILES ${_dependencies_release} DESTINATION bin
-              CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
+      INSTALL(
+        DIRECTORY ${DEP_BINARY_DIR}/
+        DESTINATION bin
+        CONFIGURATIONS Release RelWithDebInfo MinSizeRel
+        REGEX "_[Dd]\\.[a-zA-Z0-9+-]+$|-mt-gd-|^.*\\.pdb$" EXCLUDE
+      )
     ENDIF(DEP_BINARY_DIR AND WIN32)
   ENDIF(NOT DEPENDENCY_DIR)