[Orxonox-commit 7077] r11694 - code/trunk/src

[landauf at orxonox.net]

Author: landauf
Date: 2018-01-03 02:33:12 +0100 (Wed, 03 Jan 2018)
New Revision: 11694

Modified:
   code/trunk/src/CMakeLists.txt
Log:
CMP0026 is deprecated in recent versions of CMake -> moved it to the APPLE section because it seems to be used only there and therefore should be fixed there

Modified: code/trunk/src/CMakeLists.txt
===================================================================
--- code/trunk/src/CMakeLists.txt	2018-01-03 01:31:43 UTC (rev 11693)
+++ code/trunk/src/CMakeLists.txt	2018-01-03 01:33:12 UTC (rev 11694)
@@ -75,19 +75,7 @@
 # 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
@@ -96,6 +84,18 @@
     "-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(