Changeset 2723 for code/trunk

Timestamp:

Mar 1, 2009, 6:17:18 PM (16 years ago)

Author:

rgrieder

Message:

Unix update for the copyable installation.

Location:

code/trunk

Files:

• bin/CMakeLists.txt (modified) (1 diff)
• cmake/BuildConfig.cmake (modified) (1 diff)

code/trunk/bin/CMakeLists.txt

@@ -59 +59 @@
   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/orxonox_dev_build.keep_me ${CURRENT_RUNTIME_DIR}/orxonox_dev_build.keep_me)
 ENDFOREACH(_subdir)
+
+
+# Make a symlink to be able to run from the root directory when installing copyable on Unix
+IF(UNIX AND INSTALL_COPYABLE)
+  INSTAll(CODE "EXECUTE_PROCESS(COMMAND ln -sf ${ORXONOX_RUNTIME_INSTALL_PATH}/${ORXONOX_EXECUTABLE_NAME} ${CMAKE_INSTALL_PREFIX}/orxonox)")
+ENDIF()

code/trunk/cmake/BuildConfig.cmake

@@ -141 +141 @@
   # For CMake operations CMAKE_INSTALL_PREFIX is always appended.
   SET(ORXONOX_RUNTIME_INSTALL_PATH ${DEFAULT_RUNTIME_PATH})
-  # Also use runtime directory to have the libraries found when executing from anywhere
-  SET(ORXONOX_LIBRARY_INSTALL_PATH ${DEFAULT_RUNTIME_PATH})
+  SET(ORXONOX_LIBRARY_INSTALL_PATH ${DEFAULT_LIBRARY_PATH})
   SET(ORXONOX_ARCHIVE_INSTALL_PATH ${DEFAULT_ARCHIVE_PATH})
   SET(ORXONOX_DOC_INSTALL_PATH     ${DEFAULT_DOC_PATH})