Changeset 10548 for code/branches/core7

Timestamp:

Aug 26, 2015, 10:09:43 PM (9 years ago)

Author:

landauf

Message:

write the module's name into the .module/.plugin file

File:

• code/branches/core7/cmake/tools/TargetUtilities.cmake (modified) (4 diffs)

code/branches/core7/cmake/tools/TargetUtilities.cmake

@@ -470 +470 @@
 # This helps finding dynamically loadable modules or plugins at runtime
 
-FUNCTION(ADD_MODULE_OR_PLUGIN _target _output_dir _install_dir _extension)
+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)
@@ -477 +477 @@
     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)
+  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
@@ -485 +485 @@
   IF(CMAKE_CONFIGURATION_TYPES)
     FOREACH(_config ${CMAKE_CONFIGURATION_TYPES})
-      SET(_helper_filename ${_output_dir}/${_config}/${_target_name}${_extension})
-
-      FILE(WRITE ${_helper_filename})
+      SET(_helper_filename ${_output_dir}/${_config}/${_target_filename}${_extension})
+
+      FILE(WRITE ${_helper_filename} ${_target_name})
 
       INSTALL(
@@ -496 +496 @@
     ENDFOREACH()
   ELSE()
-    SET(_helper_filename ${_output_dir}/${_target_name}${_extension})
-
-    FILE(WRITE ${_helper_filename})
+    SET(_helper_filename ${_output_dir}/${_target_filename}${_extension})
+
+    FILE(WRITE ${_helper_filename} ${_target_name})
 
     INSTALL(