Changeset 2702 for code/branches/buildsystem3/media

Timestamp:

Feb 27, 2009, 2:13:29 PM (16 years ago)

Author:

rgrieder

Message:

Completed work on installation:

• The CMake switch INSTALL_COPYABLE tells whether you will be able to move the installed directory or not. If TRUE then all folders, including log and config directory, will be put into the CMAKE_INSTALL_PREFIX. Furthermore, relative paths are used, which get resolved at run time.
• If INSTALL_COPYABLE is set to FALSE, the standard operating system directories will be used. That also means on Windows files get written to the Application Data/.orxonox folder instead of Program Files/Orxonox
• Default configuration is INSTALL_COPYABLE=TRUE for Windows and FALSE for Unix

• Split OrxonoxConfig.h.in in two to avoid complete recompiles when changing only a path or INSTALL_COPYABLE
• Added a global constant character: CP_SLASH which stands for cross platform slash, meaning '/' on Unix and '
  ' on Windows
• Core class now has methods getFooPath(), getFooPathString() and getFooPathPOSIXString() where Foo can be Media, Log or Config
• getFooPathPOSIXString() will always return a directory formatted with slashes, even on Windows
• getFooPath() returns a reference to the boost::filesystem::path
• boost/filesystem.hpp does not get included to Core.h because it has a very large rat tail
• The platform specific directory stuff gets done in Core::postMainInitialisation()
• Adjusted all classes using the media path

File:

• code/branches/buildsystem3/media/CMakeLists.txt (modified) (2 diffs)

code/branches/buildsystem3/media/CMakeLists.txt

@@ -24 +24 @@
  #
 
+# This directory has to concur with the name set in BuildConfig.cmake
+IF(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}/${DEFAULT_MEDIA_PATH}")
+  MESSAGE(FATAL_ERROR "Value of DEFAULT_MEDIA_PATH does not concur with the name of the media directory in the source tree")
+ENDIF()
+
 # Specify media directory
 GET_FILENAME_COMPONENT(_search_path_1 ${CMAKE_SOURCE_DIR}/../media ABSOLUTE)
-FIND_PATH(ORXONOX_MEDIA_DEV_PATH resources.cfg
+FIND_PATH(CMAKE_MEDIA_OUTPUT_DIRECTORY resources.cfg
   PATHS
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${_search_path_1}
 )
-IF(NOT ORXONOX_MEDIA_DEV_PATH)
+IF(NOT CMAKE_MEDIA_OUTPUT_DIRECTORY)
   MESSAGE(STATUS "Warning: Media directory not found. If you want to compile while downloading the media files, you must specify the directory by Hand BEFORE compiling! Default location is orxonox_root/media")
   # Temporary override to the default location.
-  SET(ORXONOX_MEDIA_DEV_PATH ${CMAKE_SOURCE_DIR}/media)
-  SET(ORXONOX_MEDIA_DEV_PATH ${CMAKE_SOURCE_DIR}/media PARENT_SCOPE)
+  SET(CMAKE_MEDIA_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/media)
+  SET(CMAKE_MEDIA_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/media PARENT_SCOPE)
 ENDIF()
 
@@ -49 +54 @@
 
 INSTALL(
-  DIRECTORY ${ORXONOX_MEDIA_DEV_PATH}/
+  DIRECTORY ${CMAKE_MEDIA_OUTPUT_DIRECTORY}/
   DESTINATION ${ORXONOX_MEDIA_INSTALL_PATH}
   REGEX "\\.svn$|_svn$|backToPNG|${TCL_EXCLUDE_PATTERN}" EXCLUDE