Changeset 11692 for code/trunk/cmake/tools

Timestamp:

Jan 3, 2018, 1:43:20 AM (7 years ago)

Author:

landauf

Message:

with the latest CMake there are a lot of warnings about the usage of CMP0026. therefore the naming and content of the module/plugin-files had to be changed:
old: <library-filename>.module with content <target-name>
new: <target-name>.module with content <library-filename>
this seems to comply better with cmake and works equally well in c++ (with some small adjustments).
reference: ​https://cmake.org/cmake/help/v3.0/policy/CMP0026.html

File:

• code/trunk/cmake/tools/TargetUtilities.cmake (modified) (2 diffs)

code/trunk/cmake/tools/TargetUtilities.cmake

@@ -469 +469 @@
 
 
-# Creates a helper file with name <name_of_the_library>.<extension>
+# Creates a helper file with name <target_name>.<extension> and content <filename_of_the_library>
 # This helps finding dynamically loadable modules or plugins at runtime
 
 FUNCTION(ADD_MODULE_OR_PLUGIN _target_name _output_dir _install_dir _extension)
-  # We use the properties to get the name because the librarys name may differ from
-  # the target name (for example orxonox <-> liborxonox)
-  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_name} LOCATION)
-  GET_FILENAME_COMPONENT(_target_filename ${_target_loc} NAME_WE)
-  IF (POLICY CMP0026)
-    CMAKE_POLICY(POP) # set policy back to original settings
-  ENDIF()
 
   IF(CMAKE_CONFIGURATION_TYPES)
     FOREACH(_config ${CMAKE_CONFIGURATION_TYPES})
-      SET(_helper_filename ${_output_dir}/${_config}/${_target_filename}${_extension})
-
-      FILE(WRITE ${_helper_filename} ${_target_name})
+      SET(_helper_filename ${_output_dir}/${_config}/${_target_name}${_extension})
+
+      FILE(GENERATE OUTPUT ${_helper_filename} CONTENT $<TARGET_FILE_NAME:${_target_name}>)
 
       INSTALL(
@@ -498 +487 @@
     ENDFOREACH()
   ELSE()
-    SET(_helper_filename ${_output_dir}/${_target_filename}${_extension})
-
-    FILE(WRITE ${_helper_filename} ${_target_name})
+    SET(_helper_filename ${_output_dir}/${_target_name}${_extension})
+
+    FILE(GENERATE OUTPUT ${_helper_filename} CONTENT $<TARGET_FILE_NAME:${_target_name}>)
 
     INSTALL(