Changeset 2698 for code/branches

Timestamp:

Feb 23, 2009, 11:38:29 PM (16 years ago)

Author:

rgrieder

Message:

Temporary fix for the relative path problem:
On Unix, absolute paths are used always.
On Windows, relative paths are used for the installed version.
That means you cannot relocated orxonox on Unix and you must not run orxonox from another directory than where the executable is on Windows (run scripts still work because they "cd").

File:

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

code/branches/buildsystem3/cmake/BuildConfig.cmake

@@ -129 +129 @@
   # 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_MEDIA_INSTALL_PATH_EXEC  ${ORXONOX_MEDIA_INSTALL_PATH})
   SET(ORXONOX_CONFIG_INSTALL_PATH_EXEC ${ORXONOX_CONFIG_INSTALL_PATH})
   SET(ORXONOX_LOG_INSTALL_PATH_EXEC    ${ORXONOX_LOG_INSTALL_PATH})
@@ -143 +143 @@
   # 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_MEDIA_INSTALL_PATH_EXEC  ../media)
   SET(ORXONOX_CONFIG_INSTALL_PATH_EXEC ../config)
-  SET(ORXONOX_LOG_INSTALL_PATH_EXEC ../log)
+  SET(ORXONOX_LOG_INSTALL_PATH_EXEC    ../log)
 ENDIF()