Changeset 2644

Timestamp:

Feb 12, 2009, 9:41:17 AM (16 years ago)

Author:

rgrieder

Message:

• Installation instructions for the config files (tcl scripts and ini files). This is temporary until we have config directory.
• On windows, all DLLs from a precompiled package get installed too
• added media folder with a CMakeLists.txt
• media files get installed to media/ (Windows) or to /share/orxonox (Unix)

Location:

code/branches/buildsystem2

Files:

• CMakeLists.txt (modified) (1 diff)
• bin/CMakeLists.txt (modified) (2 diffs)
• cmake/BuildConfig.cmake (modified) (1 diff)
• cmake/LibraryConfig.cmake (modified) (1 diff)
• media (added)
• media/CMakeLists.txt (added)

code/branches/buildsystem2/CMakeLists.txt

@@ -42 +42 @@
 INCLUDE(BuildConfig)
 
+# Configure media directory location and installation
+ADD_SUBDIRECTORY(media)
+
 # Creates the actual project
 ADD_SUBDIRECTORY(src)
 
 # Configure the binary output directory
-ADD_SUBDIRECTORY(bin-config)
+ADD_SUBDIRECTORY(bin)
 
 # Last but not least: Try to make doxygen target

code/branches/buildsystem2/bin/CMakeLists.txt

@@ -36 +36 @@
 
 SET(WRITABLE_CONFIG_FILES
-  orxonox.ini
 )
+
+# Not getting installed
+SET(ORXONOX_INI orxonox.ini)
 
 IF(TARDIS)
@@ -86 +88 @@
   CONFIGURE_FILES("${_file_name}" "${BUILD_CONFIGS}" TRUE)
 ENDFOREACH(_file_name)
-FOREACH(_file_name ${WRITABLE_CONFIG_FILES})
+FOREACH(_file_name ${WRITABLE_CONFIG_FILES} ${ORXONOX_INI})
   CONFIGURE_FILES("${_file_name}" "${BUILD_CONFIGS}" FALSE)
 ENDFOREACH(_file_name)
+
+
+################ Installation #################
+
+# Not using collective call to allow configuration with CMake.
+FOREACH(_file ${READ_ONLY_CONFIG_FILES} ${WRITABLE_CONFIG_FILES})
+  IF(CMAKE_CONFIGURATION_TYPES)
+    FOREACH(_configuration ${CMAKE_CONFIGURATION_TYPES})
+      INSTALL(FILES ${CMAKE_BINARY_DIR}/bin/${_configuration}/${_file}
+              DESTINATION bin CONFIGURATIONS ${_configuration})
+    ENDFOREACH(_configuration)
+  ELSE()
+    INSTALL(FILES ${CMAKE_BINARY_DIR}/bin/${_file} DESTINATION bin)
+  ENDIF()
+ENDFOREACH(_file)
+
 
 ################ Run Scripts ##################

code/branches/buildsystem2/cmake/BuildConfig.cmake

@@ -55 +55 @@
 
 OPTION(EXTRA_WARNINGS "Enable some extra warnings (heavily pollutes the output)")
-
-# Specify media directory
-GET_FILENAME_COMPONENT(_media_path "${CMAKE_SOURCE_DIR}/../media" ABSOLUTE)
-SET(ORXONOX_MEDIA_DIRECTORY ${_media_path} CACHE PATH
-    "Location of the media directory.")
-IF(NOT EXISTS ${ORXONOX_MEDIA_DIRECTORY})
-  MESSAGE(STATUS "Warning: The media directory does not exist ${ORXONOX_MEDIA_DIRECTORY}")
-ENDIF()
 
 # More plugins: Plugin_BSPSceneManager, Plugin_OctreeSceneManager

code/branches/buildsystem2/cmake/LibraryConfig.cmake

@@ -60 +60 @@
     ENDFOREACH(_file)
   ENDIF()
+
+  # On Windows, DLLs have to be in the executable folder
+  IF(WIN32)
+    # 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)
+
+    # 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)
+  ENDIF(WIN32)
 ENDIF(USE_DEPENDENCY_PACKAGE)