Removed include_directories argument.

The INCLUDE_DIRECTORIES argument to the ctkMacroBuildApp,
ctkMacroBuildLip, and ctkMacroBuildPlugin macros should no longer
be used. All dependencies are modeled via the target_libraries.cmake
file and include directories to external projects should be properly
set in their corresponding CMakeExternals/*.cmake file.

Applications/ctkCLIPluginExplorer/CMakeLists.txt

@@ -24,13 +24,8 @@ SET(KIT_resources
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
 ctkMacroGetTargetLibraries(KIT_target_libraries)
 
-# Additional directories to include - Not that CTK_INCLUDE_LIBRARIES is already included
-SET(KIT_include_directories
-  )
-
 ctkMacroBuildApp(
   NAME ${PROJECT_NAME}
-  INCLUDE_DIRECTORIES ${KIT_include_directories}
   SRCS ${KIT_SRCS}
   MOC_SRCS ${KIT_MOC_SRCS}
   UI_FORMS ${KIT_UI_FORMS}

Applications/ctkDICOM/CMakeLists.txt

@@ -25,13 +25,8 @@ SET(KIT_resources
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
 ctkMacroGetTargetLibraries(KIT_target_libraries)
 
-# Additional directories to include - Not that CTK_INCLUDE_LIBRARIES is already included
-SET(KIT_include_directories
-  )
-
 ctkMacroBuildApp(
   NAME ${PROJECT_NAME}
-  INCLUDE_DIRECTORIES ${KIT_include_directories}
   SRCS ${KIT_SRCS}
   MOC_SRCS ${KIT_MOC_SRCS}
   UI_FORMS ${KIT_UI_FORMS}

Applications/ctkDICOMDemoSCU/CMakeLists.txt

@@ -12,11 +12,6 @@ ENDIF()
 #
 # See CTK/CMake/ctkMacroBuildLib.cmake for details
 #
-
-# Additional directories to include
-SET(KIT_include_directories
-  ${DCMTK_INCLUDE_DIR}
-  )
   
 # Source files
 SET(KIT_SRCS
@@ -42,7 +37,6 @@ ctkMacroGetTargetLibraries(KIT_target_libraries)
 
 ctkMacroBuildApp(
   NAME ${PROJECT_NAME}
-  INCLUDE_DIRECTORIES ${KIT_include_directories}
   SRCS ${KIT_SRCS}
   MOC_SRCS ${KIT_MOC_SRCS}
   UI_FORMS ${KIT_UI_FORMS}

Applications/ctkDICOMIndexer/CMakeLists.txt

@@ -25,13 +25,8 @@ SET(KIT_resources
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
 ctkMacroGetTargetLibraries(KIT_target_libraries)
 
-# Additional directories to include - Not that CTK_INCLUDE_LIBRARIES is already included
-SET(KIT_include_directories
-  )
-
 ctkMacroBuildApp(
   NAME ${PROJECT_NAME}
-  INCLUDE_DIRECTORIES ${KIT_include_directories}
   SRCS ${KIT_SRCS}
   MOC_SRCS ${KIT_MOC_SRCS}
   UI_FORMS ${KIT_UI_FORMS}

Applications/ctkDICOMQuery/CMakeLists.txt

@@ -25,13 +25,8 @@ SET(KIT_resources
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
 ctkMacroGetTargetLibraries(KIT_target_libraries)
 
-# Additional directories to include - Not that CTK_INCLUDE_LIBRARIES is already included
-SET(KIT_include_directories
-  )
-
 ctkMacroBuildApp(
   NAME ${PROJECT_NAME}
-  INCLUDE_DIRECTORIES ${KIT_include_directories}
   SRCS ${KIT_SRCS}
   MOC_SRCS ${KIT_MOC_SRCS}
   UI_FORMS ${KIT_UI_FORMS}

Applications/ctkDICOMRetrieve/CMakeLists.txt

@@ -25,13 +25,8 @@ SET(KIT_resources
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
 ctkMacroGetTargetLibraries(KIT_target_libraries)
 
-# Additional directories to include - Not that CTK_INCLUDE_LIBRARIES is already included
-SET(KIT_include_directories
-  )
-
 ctkMacroBuildApp(
   NAME ${PROJECT_NAME}
-  INCLUDE_DIRECTORIES ${KIT_include_directories}
   SRCS ${KIT_SRCS}
   MOC_SRCS ${KIT_MOC_SRCS}
   UI_FORMS ${KIT_UI_FORMS}

Applications/ctkPluginBrowser/CMakeLists.txt

@@ -32,13 +32,8 @@ SET(KIT_resources
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
 ctkMacroGetTargetLibraries(KIT_target_libraries)
 
-# Additional directories to include - Not that CTK_INCLUDE_LIBRARIES is already included
-SET(KIT_include_directories
-  )
-
 ctkMacroBuildApp(
   NAME ${PROJECT_NAME}
-  INCLUDE_DIRECTORIES ${KIT_include_directories}
   SRCS ${KIT_SRCS}
   MOC_SRCS ${KIT_MOC_SRCS}
   UI_FORMS ${KIT_UI_FORMS}

Applications/ctkPluginGenerator/CMakeLists.txt

@@ -31,18 +31,8 @@ SET(KIT_resources
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
 ctkMacroGetTargetLibraries(KIT_target_libraries)
 
-# Additional directories to include - Not that CTK_INCLUDE_LIBRARIES is already included
-SET(KIT_include_directories
-)
-
-# Fix this after having discussed include dependencies with Jc
-FOREACH(_dep ${${PROJECT_NAME}_DEPENDENCIES})
-  INCLUDE_DIRECTORIES(${${_dep}_SOURCE_DIR} ${${_dep}_BINARY_DIR})
-ENDFOREACH()
-
 ctkMacroBuildApp(
   NAME ${PROJECT_NAME}
-  INCLUDE_DIRECTORIES ${KIT_include_directories}
   SRCS ${KIT_SRCS}
   MOC_SRCS ${KIT_MOC_SRCS}
   UI_FORMS ${KIT_UI_FORMS}

Applications/ctkSimplePythonShell/CMakeLists.txt

@@ -29,10 +29,6 @@ SET(KIT_resources
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
 ctkMacroGetTargetLibraries(KIT_target_libraries)
 
-# Additional directories to include - Not that CTK_INCLUDE_LIBRARIES is already included
-SET(KIT_include_directories
-  )
-
 # Configure file will be configured using CTK_WRAP_PYTHONQT_{LIGHT, FULL} variable
 CONFIGURE_FILE(
   ctkSimplePythonShellConfigure.h.in
@@ -46,7 +42,6 @@ ENDIF()
 
 ctkMacroBuildApp(
   NAME ${PROJECT_NAME}
-  INCLUDE_DIRECTORIES ${KIT_include_directories}
   SRCS ${KIT_SRCS}
   MOC_SRCS ${KIT_MOC_SRCS}
   UI_FORMS ${KIT_UI_FORMS}

Libs/Core/CMakeLists.txt

@@ -12,10 +12,6 @@ INCLUDE(CMake/ctkMacroBFDCheck.cmake)
 
 SET(KIT_export_directive "CTK_CORE_EXPORT")
 
-# Additional directories to include
-SET(KIT_include_directories
-  )
-
 # Source files
 SET(KIT_SRCS
   ctkAbstractFactory.h
@@ -90,7 +86,6 @@ ctkMacroGetTargetLibraries(KIT_target_libraries)
 ctkMacroBuildLib(
   NAME ${PROJECT_NAME}
   EXPORT_DIRECTIVE ${KIT_export_directive}
-  INCLUDE_DIRECTORIES ${KIT_include_directories}
   SRCS ${KIT_SRCS}
   MOC_SRCS ${KIT_MOC_SRCS}
   UI_FORMS ${KIT_UI_FORMS}

Libs/DICOM/Core/CMakeLists.txt

@@ -6,9 +6,6 @@ PROJECT(CTKDICOMCore)
 
 SET(KIT_export_directive "CTK_DICOM_CORE_EXPORT")
 
-# Additional directories to include
-SET(KIT_include_directories
-  )
   
 # Source files
 SET(KIT_SRCS
@@ -51,7 +48,6 @@ ctkMacroGetTargetLibraries(KIT_target_libraries)
 ctkMacroBuildLib(
   NAME ${PROJECT_NAME}
   EXPORT_DIRECTIVE ${KIT_export_directive}
-  INCLUDE_DIRECTORIES ${KIT_include_directories}
   SRCS ${KIT_SRCS}
   MOC_SRCS ${KIT_MOC_SRCS}
   UI_FORMS ${KIT_UI_FORMS}

Libs/DICOM/Widgets/CMakeLists.txt

@@ -6,9 +6,6 @@ PROJECT(CTKDICOMWidgets)
 
 SET(KIT_export_directive "CTK_DICOM_WIDGETS_EXPORT")
 
-# Additional directories to include
-SET(KIT_include_directories
-  )
   
 # Source files
 SET(KIT_SRCS
@@ -53,7 +50,6 @@ ctkMacroGetTargetLibraries(KIT_target_libraries)
 ctkMacroBuildLib(
   NAME ${PROJECT_NAME}
   EXPORT_DIRECTIVE ${KIT_export_directive}
-  INCLUDE_DIRECTORIES ${KIT_include_directories}
   SRCS ${KIT_SRCS}
   MOC_SRCS ${KIT_MOC_SRCS}
   UI_FORMS ${KIT_UI_FORMS}

Libs/Messaging/Core/CMakeLists.txt

@@ -26,9 +26,6 @@ INCLUDE(${ZMQ_USE_FILE})
 
 SET(KIT_export_directive "CTK_MESSAGING_CORE_EXPORT")
 
-# Additional directories to include
-SET(KIT_include_directories
-  )
   
 # Source files
 SET(KIT_SRCS
@@ -63,7 +60,6 @@ ctkMacroGetTargetLibraries(KIT_target_libraries)
 ctkMacroBuildLib(
   NAME ${PROJECT_NAME}
   EXPORT_DIRECTIVE ${KIT_export_directive}
-  INCLUDE_DIRECTORIES ${KIT_include_directories}
   SRCS ${KIT_SRCS}
   MOC_SRCS ${KIT_MOC_SRCS}
   UI_FORMS ${KIT_UI_FORMS}

Libs/PluginFramework/CMakeLists.txt

@@ -37,9 +37,6 @@ ENDIF()
 
 SET(KIT_export_directive "CTK_PLUGINFW_EXPORT")
 
-# Additional directories to include
-SET(KIT_include_directories
-  )
   
 # Source files
 SET(KIT_SRCS
@@ -113,7 +110,6 @@ ctkMacroGetTargetLibraries(KIT_target_libraries)
 ctkMacroBuildLib(
   NAME ${PROJECT_NAME}
   EXPORT_DIRECTIVE ${KIT_export_directive}
-  INCLUDE_DIRECTORIES ${KIT_include_directories}
   SRCS ${KIT_SRCS}
   MOC_SRCS ${KIT_MOC_SRCS}
   UI_FORMS ${KIT_UI_FORMS}

Libs/Scripting/Python/Core/CMakeLists.txt

@@ -7,9 +7,6 @@ PROJECT(CTKScriptingPythonCore)
 
 SET(KIT_export_directive "CTK_SCRIPTING_PYTHON_CORE_EXPORT")
 
-# Additional directories to include
-SET(KIT_include_directories
-  )
   
 # Source files
 SET(KIT_SRCS
@@ -53,7 +50,6 @@ ctkMacroGetTargetLibraries(KIT_target_libraries)
 ctkMacroBuildLib(
   NAME ${PROJECT_NAME}
   EXPORT_DIRECTIVE ${KIT_export_directive}
-  INCLUDE_DIRECTORIES ${KIT_include_directories}
   SRCS ${KIT_SRCS}
   MOC_SRCS ${KIT_MOC_SRCS}
   UI_FORMS ${KIT_UI_FORMS}

Libs/Scripting/Python/Widgets/CMakeLists.txt

@@ -10,9 +10,6 @@ PROJECT(CTKScriptingPythonWidgets)
 
 SET(KIT_export_directive "CTK_SCRIPTING_PYTHON_WIDGETS_EXPORT")
 
-# Additional directories to include
-SET(KIT_include_directories
-  )
   
 # Source files
 SET(KIT_SRCS
@@ -40,7 +37,6 @@ ctkMacroGetTargetLibraries(KIT_target_libraries)
 ctkMacroBuildLib(
   NAME ${PROJECT_NAME}
   EXPORT_DIRECTIVE ${KIT_export_directive}
-  INCLUDE_DIRECTORIES ${KIT_include_directories}
   SRCS ${KIT_SRCS}
   MOC_SRCS ${KIT_MOC_SRCS}
   UI_FORMS ${KIT_UI_FORMS}

Libs/Visualization/VTK/Core/CMakeLists.txt

@@ -11,9 +11,6 @@ INCLUDE(${VTK_USE_FILE})
 
 SET(KIT_export_directive "CTK_VISUALIZATION_VTK_CORE_EXPORT")
 
-# Additional directories to include
-SET(KIT_include_directories
-  )
   
 # Source files
 SET(KIT_SRCS
@@ -70,7 +67,6 @@ ctkMacroGetTargetLibraries(KIT_target_libraries)
 ctkMacroBuildLib(
   NAME ${PROJECT_NAME}
   EXPORT_DIRECTIVE ${KIT_export_directive}
-  INCLUDE_DIRECTORIES ${KIT_include_directories}
   SRCS ${KIT_SRCS}
   MOC_SRCS ${KIT_MOC_SRCS}
   UI_FORMS ${KIT_UI_FORMS}

Libs/Visualization/VTK/Widgets/CMakeLists.txt

@@ -16,9 +16,6 @@ INCLUDE(${VTK_USE_FILE})
 
 SET(KIT_export_directive "CTK_VISUALIZATION_VTK_WIDGETS_EXPORT")
 
-# Additional directories to include
-SET(KIT_include_directories
-  )
   
 # Source files
 SET(KIT_SRCS
@@ -101,7 +98,6 @@ ctkMacroGetTargetLibraries(KIT_target_libraries)
 ctkMacroBuildLib(
   NAME ${PROJECT_NAME}
   EXPORT_DIRECTIVE ${KIT_export_directive}
-  INCLUDE_DIRECTORIES ${KIT_include_directories}
   SRCS ${KIT_SRCS}
   MOC_SRCS ${KIT_MOC_SRCS}
   UI_FORMS ${KIT_UI_FORMS}

Libs/Visualization/XIP/CMakeLists.txt

@@ -15,10 +15,6 @@ PROJECT(CTKVisualizationXIP)
 
 SET(KIT_export_directive "CTK_VISUALIZATION_XIP_EXPORT")
 
-# Additional directories to include
-SET(KIT_include_directories
-  #${DCMTK_INCLUDE_DIR}
-  )
   
 # Source files
 SET(KIT_SRCS
@@ -46,7 +42,6 @@ ctkMacroGetTargetLibraries(KIT_target_libraries)
 ctkMacroBuildLib(
   NAME ${PROJECT_NAME}
   EXPORT_DIRECTIVE ${KIT_export_directive}
-  INCLUDE_DIRECTORIES ${KIT_include_directories}
   SRCS ${KIT_SRCS}
   MOC_SRCS ${KIT_MOC_SRCS}
   UI_FORMS ${KIT_UI_FORMS}

Libs/Widgets/CMakeLists.txt

@@ -6,9 +6,6 @@ PROJECT(CTKWidgets)
 
 SET(KIT_export_directive "CTK_WIDGETS_EXPORT")
 
-# Additional directories to include
-SET(KIT_include_directories
-  )
 
 # Source files
 SET(KIT_SRCS
@@ -165,7 +162,6 @@ ctkMacroGetTargetLibraries(KIT_target_libraries)
 ctkMacroBuildLib(
   NAME ${PROJECT_NAME}
   EXPORT_DIRECTIVE ${KIT_export_directive}
-  INCLUDE_DIRECTORIES ${KIT_include_directories}
   SRCS ${KIT_SRCS}
   MOC_SRCS ${KIT_MOC_SRCS}
   UI_FORMS ${KIT_UI_FORMS}