Changeset 2659

Timestamp:

Feb 14, 2009, 5:54:36 PM (16 years ago)

Author:

rgrieder

Message:

Several small fixes. Installs and runs on tardis now (not to /usr of course).

Location:

code/branches/buildsystem2

Files:

• bin/CMakeLists.txt (modified) (1 diff)
• doc/api/CMakeLists.txt (modified) (1 diff)
• src/OrxonoxConfig.h.in (modified) (1 diff)

code/branches/buildsystem2/bin/CMakeLists.txt

@@ -106 +106 @@
     ENDFOREACH(_configuration)
   ELSE()
-    INSTALL(FILES ${CMAKE_BINARY_DIR}/bin/${_file} DESTINATION bin)
+    INSTALL(FILES ${CMAKE_BINARY_DIR}/bin/${_file} DESTINATION ${ORXONOX_RUNTIME_INSTALL_PATH})
   ENDIF()
 ENDFOREACH(_file)

code/branches/buildsystem2/doc/api/CMakeLists.txt

@@ -81 +81 @@
     OPTIONAL
   )
-  INSTALL(
-    DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
-    DESTINATION ${ORXONOX_DOC_INSTALL_PATH}/api
-  )
+  IF(EXISTS ${CMAAKE_CURRENT_BINARY_DIR}/html)
+    INSTALL(
+      DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
+      DESTINATION ${ORXONOX_DOC_INSTALL_PATH}/api
+    )
+  ENDIF()
 ENDIF(DOXYGEN_FOUND)

code/branches/buildsystem2/src/OrxonoxConfig.h.in

@@ -191 +191 @@
     const char* const ORXONOX_MEDIA_PATH("../media");
 #elif defined(ORXONOX_PLATFORM_LINUX)
-    const char* const ORXONOX_MEDIA_PATH("../share/orxonox");
+    const char* const ORXONOX_MEDIA_PATH("../../share/orxonox");
 #else
     /* TODO: Apple? */
-    const char* const ORXONOX_MEDIA_PATH("../share/orxonox");
+    const char* const ORXONOX_MEDIA_PATH("../../share/orxonox");
 #endif