Selaa lähdekoodia

Change ctkMacroCollectTargetLibraryNames into ctkFunctionCollectTargetLibraryNames

Jean-Christophe Fillion-Robin 14 vuotta sitten
vanhempi
commit
6a09eca3d3

+ 1 - 1
CMake/ctkFunctionGenerateDGraphInput.cmake

@@ -74,7 +74,7 @@ FUNCTION(ctkFunctionGenerateDGraphInput dir target_directories)
       SET(dependencies )
 
       # get dependencies
-      ctkMacroCollectTargetLibraryNames(${target_dir} dependencies)
+      ctkFunctionCollectTargetLibraryNames(${target_dir} dependencies)
 
       # Make sure the variable is cleared
       SET(ctk_dependencies)

+ 1 - 1
CMake/ctkFunctionGenerateProjectXml.cmake

@@ -69,7 +69,7 @@ FUNCTION(ctkFunctionGenerateProjectXml dir name target_directories is_superbuild
       SET(dependencies )
 
       # get dependencies
-      ctkMacroCollectTargetLibraryNames(${target_dir} dependencies)
+      ctkFunctionCollectTargetLibraryNames(${target_dir} dependencies)
       
       # Make sure the variable is cleared
       SET(ctk_dependencies)

+ 10 - 6
CMake/ctkMacroTargetLibraries.cmake

@@ -96,8 +96,9 @@ ENDFUNCTION()
 #
 #
 #
-MACRO(ctkMacroCollectTargetLibraryNames target_dir varname)
+FUNCTION(ctkFunctionCollectTargetLibraryNames target_dir varname)
 
+  SET(target_library_list)
   #MESSAGE(STATUS target:${target})
   SET(lib_targets)
 
@@ -124,7 +125,7 @@ MACRO(ctkMacroCollectTargetLibraryNames target_dir varname)
 
     INCLUDE(${filepath})
 
-    LIST(APPEND ${varname} ${target_libraries})
+    LIST(APPEND target_library_list ${target_libraries})
   ENDIF()
 
   IF(EXISTS ${manifestpath})
@@ -141,12 +142,15 @@ MACRO(ctkMacroCollectTargetLibraryNames target_dir varname)
     # Loop over all plugin dependencies
     FOREACH(plugin_symbolicname ${Require-Plugin})
       STRING(REPLACE "." "_" plugin_library ${plugin_symbolicname})
-      LIST(APPEND ${varname} ${plugin_library})
+      LIST(APPEND target_library_list ${plugin_library})
     ENDFOREACH()
   ENDIF()
 
-  LIST(REMOVE_DUPLICATES ${varname})
-ENDMACRO()
+  LIST(REMOVE_DUPLICATES target_library_list)
+  
+  # Pass the list of target libraries to the caller
+  SET(${varname} ${target_library_list} PARENT_SCOPE)
+ENDFUNCTION()
 
 #
 #
@@ -179,7 +183,7 @@ MACRO(ctkMacroCollectAllTargetLibraries targets subdir varname)
     
     # Collect target libraries only if option is ON
     IF(${option_name})
-      ctkMacroCollectTargetLibraryNames(${target_dir} target_libraries)
+      ctkFunctionCollectTargetLibraryNames(${target_dir} target_libraries)
     ENDIF()
 
     IF(target_libraries)