Merge topic 'ctkMacroTargetLibraries-use-cmake-function'

* ctkMacroTargetLibraries-use-cmake-function:
  Update PluginGenerator to use ctkFunctionGetTargetLibraries
  Set target property 'CTK_LIB_TARGET_SOURCE_DIR' on each CTK libraries
  Change ctkMacroCollectTargetLibraryNames into ctkFunctionCollectTargetLibraryNames
  Change ctkMacroGetTargetLibraries into ctkFunctionGetTargetLibraries
  Macro ctkMacroGetTargetLibraries can now be used out of a target directory

Applications/Testing/Cpp/CMakeLists.txt

@@ -22,9 +22,9 @@ CREATE_TEST_SOURCELIST(Tests ${KIT}CppTests.cpp
 SET (TestsToRun ${Tests})
 REMOVE (TestsToRun ${KIT}CppTests.cpp)
 
-# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkMacroGetTargetLibraries(KIT_target_libraries)
+ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
 ADD_EXECUTABLE(${KIT}CppTests ${Tests})
 TARGET_LINK_LIBRARIES(${KIT}CppTests ${KIT_target_libraries})

Applications/Testing/Cpp/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK application.
 # 

Applications/ctkCLIPluginExplorer/CMakeLists.txt

@@ -20,9 +20,9 @@ SET(KIT_UI_FORMS
 SET(KIT_resources
 )
 
-# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkMacroGetTargetLibraries(KIT_target_libraries)
+ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
 ctkMacroBuildApp(
   NAME ${PROJECT_NAME}

Applications/ctkCLIPluginExplorer/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK application.
 # 

Applications/ctkDICOM/CMakeLists.txt

@@ -21,9 +21,9 @@ SET(KIT_UI_FORMS
 SET(KIT_resources
 )
 
-# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkMacroGetTargetLibraries(KIT_target_libraries)
+ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
 ctkMacroBuildApp(
   NAME ${PROJECT_NAME}

Applications/ctkDICOM/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK application.
 # 

Applications/ctkDICOMDemoSCU/CMakeLists.txt

@@ -31,9 +31,9 @@ SET(KIT_UI_FORMS
 SET(KIT_resources
   )
 
-# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkMacroGetTargetLibraries(KIT_target_libraries)
+ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
 ctkMacroBuildApp(
   NAME ${PROJECT_NAME}

Applications/ctkDICOMDemoSCU/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK application.
 # 

Applications/ctkDICOMIndexer/CMakeLists.txt

@@ -21,9 +21,9 @@ SET(KIT_UI_FORMS
 SET(KIT_resources
 )
 
-# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkMacroGetTargetLibraries(KIT_target_libraries)
+ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
 ctkMacroBuildApp(
   NAME ${PROJECT_NAME}

Applications/ctkDICOMIndexer/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK application.
 # 

Applications/ctkDICOMQuery/CMakeLists.txt

@@ -21,9 +21,9 @@ SET(KIT_UI_FORMS
 SET(KIT_resources
 )
 
-# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkMacroGetTargetLibraries(KIT_target_libraries)
+ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
 ctkMacroBuildApp(
   NAME ${PROJECT_NAME}

Applications/ctkDICOMQuery/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK application.
 # 

Applications/ctkDICOMRetrieve/CMakeLists.txt

@@ -21,9 +21,9 @@ SET(KIT_UI_FORMS
 SET(KIT_resources
 )
 
-# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkMacroGetTargetLibraries(KIT_target_libraries)
+ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
 ctkMacroBuildApp(
   NAME ${PROJECT_NAME}

Applications/ctkDICOMRetrieve/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK application.
 # 

Applications/ctkExampleHost/CMakeLists.txt

@@ -25,9 +25,9 @@ SET(KIT_resources
   
 )
 
-# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkMacroGetTargetLibraries(KIT_target_libraries)
+ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
 ctkMacroBuildApp(
   NAME ${PROJECT_NAME}

Applications/ctkExampleHost/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK application.
 # 

Applications/ctkExampleHostedApp/CMakeLists.txt

@@ -23,9 +23,9 @@ SET(KIT_resources
   
 )
 
-# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkMacroGetTargetLibraries(KIT_target_libraries)
+ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
 ctkMacroBuildApp(
   NAME ${PROJECT_NAME}

Applications/ctkExampleHostedApp/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK application.
 # 

Applications/ctkPluginBrowser/CMakeLists.txt

@@ -30,9 +30,9 @@ SET(KIT_resources
   ctkPluginBrowserResources.qrc
 )
 
-# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkMacroGetTargetLibraries(KIT_target_libraries)
+ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
 ctkMacroBuildApp(
   NAME ${PROJECT_NAME}

Applications/ctkPluginBrowser/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK application.
 # 

Applications/ctkPluginGenerator/CMakeLists.txt

@@ -27,9 +27,9 @@ SET(KIT_resources
   ctkPluginGenerator.qrc
 )
 
-# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkMacroGetTargetLibraries(KIT_target_libraries)
+ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
 ctkMacroBuildApp(
   NAME ${PROJECT_NAME}

Applications/ctkPluginGenerator/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK application.
 # 

Applications/ctkSimplePythonShell/CMakeLists.txt

@@ -58,9 +58,9 @@ SET(VTK_LIBRARIES
   vtkFiltering
   )
 
-# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkMacroGetTargetLibraries(KIT_target_libraries)
+ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
 # Configure file will be configured using CTK_WRAP_PYTHONQT_{LIGHT, FULL} variable
 CONFIGURE_FILE(

Applications/ctkSimplePythonShell/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK application.
 # 

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)

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)

CMake/ctkMacroBuildLib.cmake

@@ -133,6 +133,7 @@ MACRO(ctkMacroBuildLib)
   IF(CTK_LIBRARY_PROPERTIES AND MY_LIBRARY_TYPE STREQUAL "SHARED")
     SET_TARGET_PROPERTIES(${lib_name} PROPERTIES ${CTK_LIBRARY_PROPERTIES})
   ENDIF()
+  SET_TARGET_PROPERTIES(${lib_name} PROPERTIES CTK_LIB_TARGET_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
   # Install rules
   IF(CTK_BUILD_SHARED_LIBS)

CMake/ctkMacroTargetLibraries.cmake

@@ -19,12 +19,24 @@
 ###########################################################################
 
 #
+# This macro could be invoked using two different signatures:
+#   ctkFunctionGetTargetLibraries(TARGET_LIBS)
+# or 
+#   ctkFunctionGetTargetLibraries(TARGET_LIBS "/path/to/ctk_target_dir")
 #
+# Without specifying the second argument, the current folder will be used.
 #
-MACRO(ctkMacroGetTargetLibraries varname)
+FUNCTION(ctkFunctionGetTargetLibraries varname)
 
-  SET(filepath ${CMAKE_CURRENT_SOURCE_DIR}/target_libraries.cmake)
-  SET(manifestpath ${CMAKE_CURRENT_SOURCE_DIR}/manifest_headers.cmake)
+  SET(expanded_target_library_list)
+
+  SET(TARGET_DIRECTORY ${ARGV1})
+  IF("${TARGET_DIRECTORY}" STREQUAL "")
+    SET(TARGET_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+  ENDIF()
+
+  SET(filepath ${TARGET_DIRECTORY}/target_libraries.cmake)
+  SET(manifestpath ${TARGET_DIRECTORY}/manifest_headers.cmake)
 
   # Check if "target_libraries.cmake" or "manifest_headers.cmake" file exists
   IF(NOT EXISTS ${filepath} AND NOT EXISTS ${manifestpath})
@@ -51,9 +63,9 @@ MACRO(ctkMacroGetTargetLibraries varname)
     FOREACH(target_library ${target_libraries})
       IF(${target_library} MATCHES "^CTK[a-zA-Z0-9]+$" OR
          ${target_library} MATCHES "^org_commontk_[a-zA-Z0-9_]+$")
-        LIST(APPEND ${varname} ${target_library})
+        LIST(APPEND expanded_target_library_list ${target_library})
       ELSE()
-        LIST(APPEND ${varname} "${${target_library}}")
+        LIST(APPEND expanded_target_library_list "${${target_library}}")
       ENDIF()
     ENDFOREACH()
   ENDIF()
@@ -72,17 +84,21 @@ MACRO(ctkMacroGetTargetLibraries varname)
     # Loop over all plugin dependencies,
     FOREACH(plugin_symbolicname ${Require-Plugin})
       STRING(REPLACE "." "_" plugin_library ${plugin_symbolicname})
-      LIST(APPEND ${varname} ${plugin_library})
+      LIST(APPEND expanded_target_library_list ${plugin_library})
     ENDFOREACH()
   ENDIF()
+  
+  # Pass the list of target libraries to the caller
+  SET(${varname} ${expanded_target_library_list} PARENT_SCOPE)
 
-ENDMACRO()
+ENDFUNCTION()
 
 #
 #
 #
-MACRO(ctkMacroCollectTargetLibraryNames target_dir varname)
+FUNCTION(ctkFunctionCollectTargetLibraryNames target_dir varname)
 
+  SET(target_library_list)
   #MESSAGE(STATUS target:${target})
   SET(lib_targets)
 
@@ -109,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})
@@ -126,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()
 
 #
 #
@@ -164,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)

Libs/Core/CMakeLists.txt

@@ -99,11 +99,11 @@ SET(KIT_UI_FORMS
 SET(KIT_resources
 )
 
-# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
 SET(KIT_target_libraries)
 
-ctkMacroGetTargetLibraries(KIT_target_libraries)
+ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
 ctkMacroBuildLib(
   NAME ${PROJECT_NAME}

Libs/Core/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK libraries
 #

Libs/DICOM/Core/CMakeLists.txt

@@ -41,9 +41,9 @@ SET(KIT_resources
   Resources/dicom.qrc
 )
 
-# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkMacroGetTargetLibraries(KIT_target_libraries)
+ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
 ctkMacroBuildLib(
   NAME ${PROJECT_NAME}

Libs/DICOM/Core/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK libraries
 # 

Libs/DICOM/Widgets/CMakeLists.txt

@@ -43,9 +43,9 @@ SET(KIT_UI_FORMS
 SET(KIT_resources
 )
 
-# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkMacroGetTargetLibraries(KIT_target_libraries)
+ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
 ctkMacroBuildLib(
   NAME ${PROJECT_NAME}

Libs/DICOM/Widgets/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK libraries
 # 

Libs/Messaging/Core/CMakeLists.txt

@@ -53,9 +53,9 @@ SET(KIT_resources
 #  vtkFiltering
 #  )
 
-# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkMacroGetTargetLibraries(KIT_target_libraries)
+ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
 ctkMacroBuildLib(
   NAME ${PROJECT_NAME}

Libs/Messaging/Core/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK libraries
 #

Libs/PluginFramework/CMakeLists.txt

@@ -131,9 +131,9 @@ ctkFunctionGeneratePluginManifest(KIT_SRCS
   VERSION "0.9.9"
   )
 
-# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkMacroGetTargetLibraries(KIT_target_libraries)
+ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
 ctkMacroBuildLib(
   NAME ${PROJECT_NAME}

Libs/PluginFramework/Testing/ConfigAdminTest/CMakeLists.txt

@@ -35,7 +35,7 @@ SET(PLUGIN_resources
   
 )
 
-ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   NAME ${PROJECT_NAME}

Libs/PluginFramework/Testing/ConfigAdminTest/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK plugin.
 # 

Libs/PluginFramework/Testing/EventAdminTest/CMakeLists.txt

@@ -34,7 +34,7 @@ SET(PLUGIN_resources
   
 )
 
-ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   NAME ${PROJECT_NAME}

Libs/PluginFramework/Testing/EventAdminTest/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK plugin.
 # 

Libs/PluginFramework/Testing/FrameworkTest/CMakeLists.txt

@@ -22,7 +22,7 @@ SET(PLUGIN_resources
   
 )
 
-ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   NAME ${PROJECT_NAME}

Libs/PluginFramework/Testing/FrameworkTest/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK plugin.
 # 

Libs/PluginFramework/Testing/FrameworkTestPlugins/pluginA2_test/CMakeLists.txt

@@ -17,7 +17,7 @@ SET(PLUGIN_resources
   
 )
 
-ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   NAME ${PROJECT_NAME}

Libs/PluginFramework/Testing/FrameworkTestPlugins/pluginA2_test/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK plugin.
 # 

Libs/PluginFramework/Testing/FrameworkTestPlugins/pluginA_test/CMakeLists.txt

@@ -17,7 +17,7 @@ SET(PLUGIN_resources
   
 )
 
-ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   NAME ${PROJECT_NAME}

Libs/PluginFramework/Testing/FrameworkTestPlugins/pluginA_test/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK plugin.
 # 

Libs/PluginFramework/Testing/FrameworkTestPlugins/pluginD_test/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK plugin.
 # 

Libs/PluginFramework/Testing/FrameworkTestPlugins/pluginSL1_test/CMakeLists.txt

@@ -20,7 +20,7 @@ SET(PLUGIN_resources
 )
 
 #Compute the plugin dependencies
-ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   NAME ${PROJECT_NAME}

Libs/PluginFramework/Testing/FrameworkTestPlugins/pluginSL1_test/target_libraries.cmake

@@ -1,4 +1,4 @@
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 #
 # This file should list the libraries required to build the current CTK plugin.
 # For specifying required plugins, see the manifest_headers.cmake file.

Libs/PluginFramework/Testing/FrameworkTestPlugins/pluginSL3_test/CMakeLists.txt

@@ -20,7 +20,7 @@ SET(PLUGIN_resources
 )
 
 # Compute the plugin dependencies
-ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   NAME ${PROJECT_NAME}

Libs/PluginFramework/Testing/FrameworkTestPlugins/pluginSL3_test/target_libraries.cmake

@@ -1,4 +1,4 @@
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 #
 # This file should list the libraries required to build the current CTK plugin.
 # For specifying required plugins, see the manifest_headers.cmake file.

Libs/PluginFramework/Testing/FrameworkTestPlugins/pluginSL4_test/CMakeLists.txt

@@ -20,7 +20,7 @@ SET(PLUGIN_resources
 )
 
 #Compute the plugin dependencies
-ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   NAME ${PROJECT_NAME}

Libs/PluginFramework/Testing/FrameworkTestPlugins/pluginSL4_test/target_libraries.cmake

@@ -1,4 +1,4 @@
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 #
 # This file should list the libraries required to build the current CTK plugin.
 # For specifying required plugins, see the manifest_headers.cmake file.

Libs/PluginFramework/Testing/MetaTypeTest/CMakeLists.txt

@@ -22,7 +22,7 @@ SET(PLUGIN_resources
   
 )
 
-ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   NAME ${PROJECT_NAME}

Libs/PluginFramework/Testing/MetaTypeTest/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK plugin.
 # 

Libs/PluginFramework/Testing/MetaTypeTestPlugins/pluginAttrPwd_test/CMakeLists.txt

@@ -25,7 +25,7 @@ SET(PLUGIN_ts_files
 )
 
 #Compute the plugin dependencies
-ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   NAME ${PROJECT_NAME}

Libs/PluginFramework/Testing/MetaTypeTestPlugins/pluginAttrPwd_test/target_libraries.cmake

@@ -1,4 +1,4 @@
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 #
 # This file should list the libraries required to build the current CTK plugin.
 # For specifying required plugins, see the manifest_headers.cmake file.

Libs/PluginFramework/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK libraries
 #

Libs/Scripting/Python/Core/CMakeLists.txt

@@ -46,9 +46,9 @@ CONFIGURE_FILE(
   ${CMAKE_CURRENT_BINARY_DIR}/ctkScriptingPythonCoreConfigure.h
   )
 
-# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkMacroGetTargetLibraries(KIT_target_libraries)
+ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
 # Link against vtkPython if required
 IF(CTK_LIB_Scripting/Python/Core_PYTHONQT_USE_VTK)

Libs/Scripting/Python/Core/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK libraries
 #

Libs/Scripting/Python/Widgets/CMakeLists.txt

@@ -33,9 +33,9 @@ SET(KIT_UI_FORMS
 SET(KIT_resources
 )
 
-# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkMacroGetTargetLibraries(KIT_target_libraries)
+ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
 ctkMacroBuildLib(
   NAME ${PROJECT_NAME}

Libs/Scripting/Python/Widgets/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK libraries
 #

Libs/Visualization/VTK/Core/CMakeLists.txt

@@ -60,9 +60,9 @@ SET(VTK_LIBRARIES
   vtkHybrid
   )
 
-# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkMacroGetTargetLibraries(KIT_target_libraries)
+ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
 ctkMacroBuildLib(
   NAME ${PROJECT_NAME}

Libs/Visualization/VTK/Core/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK libraries
 #

Libs/Visualization/VTK/Widgets/CMakeLists.txt

@@ -103,9 +103,9 @@ IF (${CTK_USE_CHARTS})
   ADD_DEFINITIONS(-DCTK_USE_CHARTS)
 ENDIF(${CTK_USE_CHARTS})
 
-# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkMacroGetTargetLibraries(KIT_target_libraries)
+ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
 ctkMacroBuildLib(
   NAME ${PROJECT_NAME}

Libs/Visualization/VTK/Widgets/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK libraries
 #

Libs/Visualization/XIP/CMakeLists.txt

@@ -35,9 +35,9 @@ SET(KIT_UI_FORMS
 SET(KIT_resources
 )
 
-# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkMacroGetTargetLibraries(KIT_target_libraries)
+ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
 ctkMacroBuildLib(
   NAME ${PROJECT_NAME}

Libs/Visualization/XIP/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK libraries
 # 

Libs/Widgets/CMakeLists.txt

@@ -215,9 +215,9 @@ SET(KIT_resources
   Resources/CTKWidgets.qrc
   )
 
-# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# Target libraries - See CMake/ctkFunctionGetTargetLibraries.cmake
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
-ctkMacroGetTargetLibraries(KIT_target_libraries)
+ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
 ctkMacroBuildLib(
   NAME ${PROJECT_NAME}

Libs/Widgets/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK libraries
 #

Plugins/org.commontk.cli/CMakeLists.txt

@@ -20,7 +20,7 @@ SET(PLUGIN_cached_resourcefiles
   servicedescriptor.xml
 )
 
-ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   NAME ${PROJECT_NAME}

Plugins/org.commontk.cli/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK plugin.
 # 

Plugins/org.commontk.configadmin/CMakeLists.txt

@@ -47,7 +47,7 @@ SET(PLUGIN_resources
 )
 
 #Compute the plugin dependencies
-ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   NAME ${PROJECT_NAME}

Plugins/org.commontk.configadmin/target_libraries.cmake

@@ -1,4 +1,4 @@
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 #
 # This file should list the libraries required to build the current CTK plugin.
 # For specifying required plugins, see the manifest_headers.cmake file.

Plugins/org.commontk.dah.app/CMakeLists.txt

@@ -29,7 +29,7 @@ SET(PLUGIN_resources
 )
 
 #Compute the plugin dependencies
-ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   NAME ${PROJECT_NAME}

Plugins/org.commontk.dah.core/CMakeLists.txt

@@ -38,7 +38,7 @@ SET(PLUGIN_resources
 )
 
 #Compute the plugin dependencies
-ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   NAME ${PROJECT_NAME}

Plugins/org.commontk.dah.core/target_libraries.cmake

@@ -1,4 +1,4 @@
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 #
 # This file should list the libraries required to build the current CTK plugin.
 # For specifying required plugins, see the manifest_headers.cmake file.

Plugins/org.commontk.dah.exampleapp/CMakeLists.txt

@@ -24,7 +24,7 @@ SET(PLUGIN_resources
 )
 
 #Compute the plugin dependencies
-ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   NAME ${PROJECT_NAME}

Plugins/org.commontk.dah.examplehost/CMakeLists.txt

@@ -28,7 +28,7 @@ SET(PLUGIN_resources
 SET(PLUGIN_include_directories
 )
 #Compute the plugin dependencies
-ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   NAME ${PROJECT_NAME}

Plugins/org.commontk.dah.host/CMakeLists.txt

@@ -28,7 +28,7 @@ SET(PLUGIN_resources
 )
 
 #Compute the plugin dependencies
-ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   NAME ${PROJECT_NAME}

Plugins/org.commontk.eventadmin/CMakeLists.txt

@@ -112,7 +112,7 @@ SET(PLUGIN_CACHED_RESOURCEFILES
   
 )
 
-ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   EXPORT_DIRECTIVE ${PLUGIN_export_directive}

Plugins/org.commontk.eventadmin/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK plugin.
 # 

Plugins/org.commontk.eventbus/CMakeLists.txt

@@ -21,7 +21,7 @@ SET(PLUGIN_CACHED_RESOURCEFILES
   servicedescriptor.xml
 )
 
-ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   EXPORT_DIRECTIVE ${PLUGIN_export_directive}

Plugins/org.commontk.eventbus/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK plugin.
 # 

Plugins/org.commontk.log/CMakeLists.txt

@@ -22,7 +22,7 @@ SET(PLUGIN_resources
 )
 
 #Compute the plugin dependencies
-ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   NAME ${PROJECT_NAME}

Plugins/org.commontk.log/target_libraries.cmake

@@ -1,4 +1,4 @@
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 #
 # This file should list the libraries required to build the current CTK plugin.
 # For specifying required plugins, see the manifest_headers.cmake file.

Plugins/org.commontk.log4qt/CMakeLists.txt

@@ -20,7 +20,7 @@ SET(PLUGIN_resources
 )
 
 #Compute the plugin dependencies
-ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   NAME ${PROJECT_NAME}

Plugins/org.commontk.log4qt/target_libraries.cmake

@@ -1,4 +1,4 @@
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 #
 # This file should list the libraries required to build the current CTK plugin.
 # For specifying required plugins, see the manifest_headers.cmake file.

Plugins/org.commontk.metatype/CMakeLists.txt

@@ -44,7 +44,7 @@ SET(PLUGIN_resources
 )
 
 #Compute the plugin dependencies
-ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   NAME ${PROJECT_NAME}

Plugins/org.commontk.metatype/target_libraries.cmake

@@ -1,4 +1,4 @@
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 #
 # This file should list the libraries required to build the current CTK plugin.
 # For specifying required plugins, see the manifest_headers.cmake file.

Plugins/org.commontk.plugingenerator.core/CMakeLists.txt

@@ -30,7 +30,7 @@ SET(PLUGIN_resources
   
 )
 
-ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   NAME ${PROJECT_NAME}

Plugins/org.commontk.plugingenerator.core/ctkPluginGeneratorCMakeLists.cpp

@@ -93,7 +93,7 @@ QString ctkPluginGeneratorCMakeLists::generateContent()
   stream
     << ")\n\n"
     << "#Compute the plugin dependencies\n"
-    << "ctkMacroGetTargetLibraries(PLUGIN_target_libraries)\n\n"
+    << "ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)\n\n"
     << "ctkMacroBuildPlugin(\n"
     << "  NAME ${PROJECT_NAME}\n"
     << "  EXPORT_DIRECTIVE ${PLUGIN_export_directive}\n"

Plugins/org.commontk.plugingenerator.core/ctkPluginGeneratorTargetLibraries.cpp

@@ -37,7 +37,7 @@ QString ctkPluginGeneratorTargetLibraries::generateContent()
   QString content;
   QTextStream stream(&content);
 
-  stream << "# See CMake/ctkMacroGetTargetLibraries.cmake\n"
+  stream << "# See CMake/ctkFunctionGetTargetLibraries.cmake\n"
       << "#\n"
       << "# This file should list the libraries required to build the current CTK plugin.\n"
       << "# For specifying required plugins, see the manifest_headers.cmake file.\n"

Plugins/org.commontk.plugingenerator.core/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK plugin.
 # 

Plugins/org.commontk.plugingenerator.ui/CMakeLists.txt

@@ -23,7 +23,7 @@ SET(PLUGIN_resources
   
 )
 
-ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   NAME ${PROJECT_NAME}

Plugins/org.commontk.plugingenerator.ui/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK plugin.
 # To specify required plugins, see the file manifest_headers.cmake.

Plugins/org.commontk.qtmobility.service/CMakeLists.txt

@@ -19,7 +19,7 @@ SET(PLUGIN_resources
 
 )
 
-ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   EXPORT_DIRECTIVE ${PLUGIN_export_directive}

Plugins/org.commontk.qtmobility.service/target_libraries.cmake

@@ -1,5 +1,5 @@
 #
-# See CMake/ctkMacroGetTargetLibraries.cmake
+# See CMake/ctkFunctionGetTargetLibraries.cmake
 # 
 # This file should list the libraries required to build the current CTK plugin.
 #