Changeset 2684

Timestamp:

Feb 19, 2009, 5:50:04 PM (16 years ago)

Author:

rgrieder

Message:

Added convenience run script again on request, but to the build directory this time.

Location:

code/branches/buildsystem3/bin

Files:

• CMakeLists.txt (modified) (1 diff)
• run.bat.in (moved) (moved from code/branches/buildsystem3/bin/run.bat)
• run.in (copied) (copied from code/branches/buildsystem3/bin/run) (1 diff)

code/branches/buildsystem3/bin/CMakeLists.txt

@@ -115 +115 @@
 # 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})
+  SET(RUN_SCRIPT run.bat)
+ELSEIF(UNIX)
+  SET(RUN_SCRIPT run)
+ENDIF()
+
+IF(NOT CMAKE_CONFIGURATION_TYPES)
+  SET(_subdirs .)
+  SEt(_default_subdir .)
+ELSE()
+  SET(_subdirs ${CMAKE_CONFIGURATION_TYPES})
+  SEt(_default_subdir Debug)
+ENDIF()
+STRING(REPLACE "/" "\\" ORXONOX_RUNTIME_LIBRARY_DIRECTORY_WINDOWS ${ORXONOX_RUNTIME_LIBRARY_DIRECTORY})
+FOREACH(_subdir ${_subdirs})
+  GET_FILENAME_COMPONENT(CURRENT_RUNTIME_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${_subdir} 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 ${CURRENT_RUNTIME_DIR})
+  STRING(REPLACE "/" "\\" CURRENT_RUNTIME_DIR_WINDOWS ${CURRENT_RUNTIME_DIR})
+
+  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${RUN_SCRIPT}.in ${CURRENT_RUNTIME_DIR}/${RUN_SCRIPT} @ONLY)
+  IF(_subdir STREQUAL _default_subdir)
+    # Convenience script to be used when sitting in the binary directory. Defaults to Debug for msvc.
+    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${RUN_SCRIPT}.in ${CMAKE_BINARY_DIR}/${RUN_SCRIPT} @ONLY)
   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 ${CURRENT_RUNTIME_DIR})
-    STRING(REPLACE "/" "\\" CURRENT_RUNTIME_DIR_WINDOWS ${CURRENT_RUNTIME_DIR})
-    STRING(REPLACE "/" "\\" ORXONOX_RUNTIME_LIBRARY_DIRECTORY_WINDOWS ${ORXONOX_RUNTIME_LIBRARY_DIRECTORY})
-
-    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/run.bat ${CURRENT_RUNTIME_DIR}/run.bat @ONLY)
-  ENDFOREACH(_configuration)
-ENDIF(WIN32)
+ENDFOREACH(_subdir)

code/branches/buildsystem3/bin/run.in

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