[Orxonox-commit 663] r3195 - branches/pch/bin

rgrieder at orxonox.net rgrieder at orxonox.net
Fri Jun 19 14:28:24 CEST 2009


Author: rgrieder
Date: 2009-06-19 14:28:24 +0200 (Fri, 19 Jun 2009)
New Revision: 3195

Modified:
   branches/pch/bin/CMakeLists.txt
Log:
Reverted some changes previously made: on non-MSVC platforms you can now find the run scripts again in top binary directory.

Modified: branches/pch/bin/CMakeLists.txt
===================================================================
--- branches/pch/bin/CMakeLists.txt	2009-06-19 12:19:27 UTC (rev 3194)
+++ branches/pch/bin/CMakeLists.txt	2009-06-19 12:28:24 UTC (rev 3195)
@@ -39,8 +39,10 @@
 
 IF(NOT CMAKE_CONFIGURATION_TYPES)
   SET(_subdirs .)
+  SEt(_default_subdir .)
 ELSE()
   SET(_subdirs ${CMAKE_CONFIGURATION_TYPES})
+  SEt(_default_subdir) # No default subdir
 ENDIF()
 STRING(REPLACE "/" "\\" ORXONOX_RUNTIME_LIBRARY_DIRECTORY_WINDOWS ${ORXONOX_RUNTIME_LIBRARY_DIRECTORY})
 FOREACH(_subdir ${_subdirs})
@@ -52,6 +54,10 @@
 
   FOREACH(_script ${RUN_SCRIPTS})
     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${_script}.in ${CURRENT_RUNTIME_DIR}/${_script} @ONLY)
+    IF(_subdir STREQUAL _default_subdir)
+      # Convenience script to be used when sitting in the binary directory. Does nothing for MSVC
+      CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${_script}.in ${CMAKE_BINARY_DIR}/${_script} @ONLY)
+    ENDIF()
   ENDFOREACH(_script)
 
   # In order to evaluate at run time whether it is a dev build in the build tree,




More information about the Orxonox-commit mailing list