Changeset 11697 for code/trunk

Timestamp:

Jan 3, 2018, 11:13:37 AM (7 years ago)

Author:

landauf

Message:

reverted r11694, apparently ORXONOX_EXECUTABLE_NAME IS used (for run-scripts in ./bin)

File:

• code/trunk/src/CMakeLists.txt (modified) (2 diffs)

code/trunk/src/CMakeLists.txt

@@ -76 +76 @@
 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
@@ -84 +96 @@
     "-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