Changeset 2687 for code/branches/buildsystem3/cmake/BuildConfig.cmake

Timestamp:

Feb 21, 2009, 12:20:23 AM (15 years ago)

Author:

rgrieder

Message:

Installation paths should be relative when using in C++ code if they're actually relative.
This ensures copy & paste installations under windows. For Unix it is only useful when installation to an arbitrary folder instead of /usr
(also resolves a problem the with tcl lib path; Apparently Tcl cannot cope with spaces in the path (and neither "\") so C:/Program Files/ was not working at all)

• boost::filesystem::path::native_file_string is depricated, using file_string now.

File:

• code/branches/buildsystem3/cmake/BuildConfig.cmake (modified) (2 diffs)

code/branches/buildsystem3/cmake/BuildConfig.cmake

@@ -126 +126 @@
   SET(ORXONOX_LOG_INSTALL_PATH     ${USER_DIR}/.orxonox/log)
   SET(ORXONOX_CONFIG_INSTALL_PATH  ${USER_DIR}/.orxonox/config)
+
+  # Execution paths, either relative to the binary dir or absolute
+  # For Windows copy&paste installs relative paths are much better
+  SET(ORXONOX_MEDIA_INSTALL_PATH_EXEC ../../share/orxonox)
+  SET(ORXONOX_CONFIG_INSTALL_PATH_EXEC ${ORXONOX_CONFIG_INSTALL_PATH})
+  SET(ORXONOX_LOG_INSTALL_PATH_EXEC    ${ORXONOX_LOG_INSTALL_PATH})
 ELSEIF(WIN32)
   SET(ORXONOX_RUNTIME_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/bin)
@@ -134 +140 @@
   SET(ORXONOX_LOG_INSTALL_PATH     ${CMAKE_INSTALL_PREFIX}/log)
   SET(ORXONOX_CONFIG_INSTALL_PATH  ${CMAKE_INSTALL_PREFIX}/config)
+
+  # Execution paths, either relative to the binary dir or absolute
+  # For Windows copy&paste installs relative paths are much better
+  SET(ORXONOX_MEDIA_INSTALL_PATH_EXEC ../media)
+  SET(ORXONOX_CONFIG_INSTALL_PATH_EXEC ../config)
+  SET(ORXONOX_LOG_INSTALL_PATH_EXEC ../log)
 ENDIF()