[Orxonox-commit 7080] r11697 - code/trunk/src

[landauf at orxonox.net]

Author: landauf
Date: 2018-01-03 11:13:37 +0100 (Wed, 03 Jan 2018)
New Revision: 11697

Modified:
   code/trunk/src/CMakeLists.txt
Log:
reverted r11694, apparently ORXONOX_EXECUTABLE_NAME IS used (for run-scripts in ./bin)

Modified: code/trunk/src/CMakeLists.txt
===================================================================
--- code/trunk/src/CMakeLists.txt	2018-01-03 10:09:12 UTC (rev 11696)
+++ code/trunk/src/CMakeLists.txt	2018-01-03 10:13:37 UTC (rev 11697)
@@ -75,7 +75,19 @@
 # Main executable should depend on all modules (but not on plugins)
 ADD_DEPENDENCIES(orxonox-main ${ORXONOX_MODULES})
 
+# Get name to configure the run scripts
+IF (POLICY CMP0026)
+  CMAKE_POLICY(PUSH)
+  CMAKE_POLICY(SET CMP0026 OLD) # we only use the file's name, not its actual location, so the old policy is fine
+ENDIF()
+GET_TARGET_PROPERTY(_exec_loc orxonox-main LOCATION)
+GET_FILENAME_COMPONENT(_exec_name ${_exec_loc} NAME)
+SET(ORXONOX_EXECUTABLE_NAME ${_exec_name} CACHE INTERNAL "")
+IF (POLICY CMP0026)
+  CMAKE_POLICY(POP) # set policy back to original settings
+ENDIF()
 
+
 # Apple Mac OS X specific build settings
 IF(APPLE)
   # On Apple we need to link to AppKit and Foundation frameworks
@@ -84,18 +96,6 @@
     "-framework Foundation"
   )
 
-  # Get name to configure the run scripts
-  IF (POLICY CMP0026)
-    CMAKE_POLICY(PUSH)
-    CMAKE_POLICY(SET CMP0026 OLD) # we only use the file's name, not its actual location, so the old policy is fine
-  ENDIF()
-  GET_TARGET_PROPERTY(_exec_loc orxonox-main LOCATION)
-  GET_FILENAME_COMPONENT(_exec_name ${_exec_loc} NAME)
-  SET(ORXONOX_EXECUTABLE_NAME ${_exec_name} CACHE INTERNAL "")
-  IF (POLICY CMP0026)
-    CMAKE_POLICY(POP) # set policy back to original settings
-  ENDIF()
-
   # Post-build step for the creation of the Dev-App bundle
   INCLUDE(PrepareDevBundle)
   ADD_CUSTOM_COMMAND(