Changeset 3345 for code/branches/resource/cmake

Timestamp:

Jul 24, 2009, 9:31:31 PM (15 years ago)

Author:

rgrieder

Message:

Fixed installation: The Tcl script library should now be found in the installed version as well.

Location:

code/branches/resource/cmake

Files:

• Media.cmake (modified) (1 diff)
• PackageConfig.cmake (modified) (1 diff)

code/branches/resource/cmake/Media.cmake

@@ -45 +45 @@
 ################ Installation #################
 
-# Try no to copy both tcl script file libraries
-IF(TCL_LIBRARY MATCHES "85|8\\.5")
-  SET(TCL_EXCLUDE_PATTERN "tcl8\\.4")
-ELSEIF(TCL_LIBRARY MATCHES "84|8\\.4")
-  SET(TCL_EXCLUDE_PATTERN "tcl8\\.5")
-ENDIF()
-
 INSTALL(
   DIRECTORY ${CMAKE_MEDIA_OUTPUT_DIRECTORY}/
   DESTINATION ${ORXONOX_MEDIA_INSTALL_PATH}
-  REGEX "\\.svn$|_svn$|backToPNG|${TCL_EXCLUDE_PATTERN}" EXCLUDE
+  REGEX "\\.svn$|_svn$|backToPNG" EXCLUDE
 )

code/branches/resource/cmake/PackageConfig.cmake

@@ -45 +45 @@
 LIST(APPEND CMAKE_INCLUDE_PATH ${DEP_INCLUDE_DIR}/zlib-1.2.3/include)
 
-SET(TCL_LIBRARY_DIR ${DEPENDENCY_PACKAGE_DIR}/tcl)
+### INSTALL ###
 
-### INSTALL ###
+# Tcl script library
+INSTALL(
+  DIRECTORY ${DEP_LIBRARY_DIR}/tcl/
+  DESTINATION lib/tcl
+)
+
 # On Windows, DLLs have to be in the executable folder, install them
 IF(WIN32 AND DEP_BINARY_DIR)