Changeset 10186 for code/trunk

Timestamp:

Jan 10, 2015, 2:35:30 PM (10 years ago)

Author:

landauf

Message:

trying to make cmake policy settings backwards compatible

Location:

code/trunk

Files:

• cmake/tools/TargetUtilities.cmake (modified) (1 diff)
• src/CMakeLists.txt (modified) (1 diff)

code/trunk/cmake/tools/TargetUtilities.cmake

@@ -447 +447 @@
   # We use the properties to get the name because the librarys name may differ from
   # the target name (for example orxonox <-> liborxonox)
-
-  CMAKE_POLICY(SET CMP0026 OLD) # we only use the file's name, not its actual location, so the old policy is fine
+  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(_target_loc ${_target} LOCATION)
   GET_FILENAME_COMPONENT(_target_name ${_target_loc} NAME_WE)
-  CMAKE_POLICY(SET CMP0026 NEW) # set policy back to 'new'
+  IF (POLICY CMP0026)
+    CMAKE_POLICY(POP) # set policy back to original settings
+  ENDIF()
 
   IF(CMAKE_CONFIGURATION_TYPES)

code/trunk/src/CMakeLists.txt

@@ -73 +73 @@
 
 # Get name to configure the run scripts
-CMAKE_POLICY(SET CMP0026 OLD) # we only use the file's name, not its actual location, so the old policy is fine
+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 "")
-CMAKE_POLICY(SET CMP0026 NEW) # set policy back to 'new'
+IF (POLICY CMP0026)
+  CMAKE_POLICY(POP) # set policy back to original settings
+ENDIF()