Changeset 11698 for code

Timestamp:

Jan 3, 2018, 11:19:53 AM (7 years ago)

Author:

landauf

Message:

still trying to avoid CMP0026… can we define ORXONOX_EXECUTABLE_NAME like this? seems to work on windows and probably works on linux too (please test)

File:

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

code/trunk/src/CMakeLists.txt

@@ -64 +64 @@
 ENDIF()
 
+SET(ORXONOX_EXECUTABLE_NAME "orxonox" CACHE INTERNAL "")
+
 ORXONOX_ADD_EXECUTABLE(orxonox-main
   # When defined as WIN32 this removes the console window on Windows
@@ -71 +73 @@
   SOURCE_FILES
     ${ORXONOX_MAIN_FILES}
-  OUTPUT_NAME orxonox
+  OUTPUT_NAME
+    ${ORXONOX_EXECUTABLE_NAME}
 )
 # 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()