Changeset 2591 for code/branches/buildsystem2

Timestamp:

Jan 12, 2009, 5:21:13 PM (16 years ago)

Author:

rgrieder

Message:

Fixed two bugs with the run script. Works now on tardis, not tested on MinGW.

Location:

code/branches/buildsystem2/bin

Files:

• CMakeLists.txt (modified) (2 diffs)
• run (modified) (1 diff)

code/branches/buildsystem2/bin/CMakeLists.txt

@@ -12 +12 @@
   # OGRE can't find fonts to display config screen on Tardis,
   # so providing default config file here (bug).
-  SET(ADDITIONAL_CONFIG_FILES "ogre.cfg")
+  SET(ADDITIONAL_CONFIG_FILES ogre.cfg)
 ENDIF(TARDIS)
 
@@ -57 +57 @@
 IF(NOT CMAKE_CONFIGURATION_TYPES)
   IF(WIN32)
-    SET(RUN_SCRIPT ${ADDITIONAL_CONFIG_FILES} "run.bat")
+    SET(RUN_SCRIPT run.bat)
   ELSE(UNIX)
-    SET(RUN_SCRIPT ${ADDITIONAL_CONFIG_FILES} "run")
+    SET(RUN_SCRIPT run)
   ENDIF(WIN32)
   IF (NOT EXISTS ${CMAKE_SOURCE_DIR}/${RUN_SCRIPT})

code/branches/buildsystem2/bin/run

@@ -2 +2 @@
 # convenience script for starting orxonox on Linux
 
-cd @EXECUTABLE_OUTPUT_PATH@ && exec ./@ORXONOX_EXECUTABLE_NAME@ $@
+cd @CMAKE_RUNTIME_OUTPUT_DIRECTORY@ && exec ./@ORXONOX_EXECUTABLE_NAME@ $@