Changeset 2680

Timestamp:

Feb 16, 2009, 11:10:47 PM (15 years ago)

Author:

rgrieder

Message:

• Removed run script completely for Linux
• Removed root dir run script on windows
• Added run scripts for the 4 different visual studio output directories

Location:

code/branches/buildsystem3

Files:

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

code/branches/buildsystem3/bin/CMakeLists.txt

@@ -113 +113 @@
 ################ Run Scripts ##################
 
-# Create a run script for both Windows and Linux in the source root path if
-# CMake is not used to create multi-configuration project files
-IF(NOT CMAKE_CONFIGURATION_TYPES)
-  IF(WIN32)
-    SET(RUN_SCRIPT run.bat)
+# Create a run script for Windows to manually add the DLL path when executing
+IF(WIN32)
+  IF(NOT CMAKE_CONFIGURATION_TYPES)
+    SET(_config_types ".")
+  ELSE()
+    SET(_config_types ${CMAKE_CONFIGURATION_TYPES})
+  ENDIF()
+  FOREACH(_configuration ${_config_types})
+    GET_FILENAME_COMPONENT(CURRENT_RUNTIME_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_configuration} ABSOLUTE)
+
     # Note: Do not use FILE(TO_NATIVE_PATH) because it doesn't work for MinGW
-    STRING(REGEX REPLACE "^([A-Z]\\:)\\/.*$" "\\1" WINDOWS_DRIVE_CHANGE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-    STRING(REPLACE "/" "\\" CMAKE_RUNTIME_OUTPUT_DIRECTORY_WINDOWS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+    STRING(REGEX REPLACE "^([A-Z]\\:)\\/.*$" "\\1" WINDOWS_DRIVE_CHANGE ${CURRENT_RUNTIME_DIR})
+    STRING(REPLACE "/" "\\" CURRENT_RUNTIME_DIR_WINDOWS ${CURRENT_RUNTIME_DIR})
     STRING(REPLACE "/" "\\" ORXONOX_RUNTIME_LIBRARY_DIRECTORY_WINDOWS ${ORXONOX_RUNTIME_LIBRARY_DIRECTORY})
-  ELSE(UNIX)
-    SET(RUN_SCRIPT run)
-  ENDIF(WIN32)
-  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${RUN_SCRIPT} ${CMAKE_SOURCE_DIR}/${RUN_SCRIPT} @ONLY)
-  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${RUN_SCRIPT} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${RUN_SCRIPT} @ONLY)
-ENDIF(NOT CMAKE_CONFIGURATION_TYPES)
+
+    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/run.bat ${CURRENT_RUNTIME_DIR}/run.bat @ONLY)
+  ENDFOREACH(_configuration)
+ENDIF(WIN32)

code/branches/buildsystem3/bin/run.bat

@@ -2 +2 @@
 path @ORXONOX_RUNTIME_LIBRARY_DIRECTORY_WINDOWS@;%path%
 @WINDOWS_DRIVE_CHANGE@
-cd @CMAKE_RUNTIME_OUTPUT_DIRECTORY_WINDOWS@
+cd @CURRENT_RUNTIME_DIR_WINDOWS@
 @ORXONOX_EXECUTABLE_NAME@
 pause

code/branches/buildsystem3/cmake/BuildConfig.cmake

@@ -113 +113 @@
 OPTION(NETWORK_TESTING_ENABLED "Build network testing tools: i.e. chatclient chatserver and alike.")
 OPTION(NETWORKTRAFFIC_TESTING_ENABLED "Build dummyserver4 and dummyclient4.")
+
+
 ############# Installation Settings #############