[Orxonox-commit 8] r2723 - in trunk: bin cmake

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-03-01 18:17:18 +0100 (Sun, 01 Mar 2009)
New Revision: 2723

Modified:
   trunk/bin/CMakeLists.txt
   trunk/cmake/BuildConfig.cmake
Log:
Unix update for the copyable installation.

Modified: trunk/bin/CMakeLists.txt
===================================================================
--- trunk/bin/CMakeLists.txt	2009-03-01 16:31:32 UTC (rev 2722)
+++ trunk/bin/CMakeLists.txt	2009-03-01 17:17:18 UTC (rev 2723)
@@ -58,3 +58,9 @@
   # we plant a special file
   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()

Modified: trunk/cmake/BuildConfig.cmake
===================================================================
--- trunk/cmake/BuildConfig.cmake	2009-03-01 16:31:32 UTC (rev 2722)
+++ trunk/cmake/BuildConfig.cmake	2009-03-01 17:17:18 UTC (rev 2723)
@@ -140,8 +140,7 @@
   # Note the relative paths. They will be resolved at runtime.
   # 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})
   SET(ORXONOX_MEDIA_INSTALL_PATH   ${DEFAULT_MEDIA_PATH})