Do not set unused CMake build function parameter INCLUDE_DIRECTORIES

Following previous commit, the INCLUDE_DIRECTORIES parameter
has no effect.

Applications/ctkEventBusDemo/CMakeLists.txt

@@ -29,10 +29,6 @@ set(KIT_resources
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
 ctkFunctionGetTargetLibraries(KIT_target_libraries)
 
-# Additional directories to include - Note 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})
@@ -40,7 +36,6 @@ endforeach()
 
 ctkMacroBuildApp(
   NAME ${PROJECT_NAME}
-  INCLUDE_DIRECTORIES ${KIT_include_directories}
   SRCS ${KIT_SRCS}
   MOC_SRCS ${KIT_MOC_SRCS}
   UI_FORMS ${KIT_UI_FORMS}

CMake/ctkMacroBuildApp.cmake

@@ -31,6 +31,8 @@ macro(ctkMacroBuildApp)
     ${ARGN}
     )
 
+  # Keep parameter 'INCLUDE_DIRECTORIES' for backward compatiblity
+
   # Sanity checks
   if(NOT DEFINED MY_NAME)
     message(FATAL_ERROR "NAME is mandatory")
@@ -54,7 +56,6 @@ macro(ctkMacroBuildApp)
   set(my_includes
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${MY_INCLUDE_DIRECTORIES}
     )
 
   # Add the include directories from the library dependencies

CMake/ctkMacroBuildLib.cmake

@@ -33,6 +33,8 @@ macro(ctkMacroBuildLib)
     ${ARGN}
     )
 
+  # Keep parameter 'INCLUDE_DIRECTORIES' for backward compatiblity
+
   # Sanity checks
   if(NOT DEFINED MY_NAME)
     message(FATAL_ERROR "NAME is mandatory")
@@ -63,7 +65,6 @@ macro(ctkMacroBuildLib)
     ${CMAKE_CURRENT_BINARY_DIR}
     # with CMake >2.9, use QT4_MAKE_OUTPUT_FILE instead ?
     ${CMAKE_CURRENT_BINARY_DIR}/Resources/UI
-    ${MY_INCLUDE_DIRECTORIES}
     )
 
   # Add the include directories from the library dependencies

CMake/ctkMacroBuildPlugin.cmake

@@ -55,6 +55,8 @@ macro(ctkMacroBuildPlugin)
     ${ARGN}
     )
 
+  # Keep parameter 'INCLUDE_DIRECTORIES' for backward compatiblity
+
   # Sanity checks
   if(NOT DEFINED MY_EXPORT_DIRECTIVE)
     message(FATAL_ERROR "EXPORT_DIRECTIVE is mandatory")
@@ -132,7 +134,6 @@ macro(ctkMacroBuildPlugin)
   list(APPEND my_includes
       ${CMAKE_CURRENT_SOURCE_DIR}
       ${CMAKE_CURRENT_BINARY_DIR}
-      ${MY_INCLUDE_DIRECTORIES}
       )
 
   # Add the include directories from the plugin dependencies

Libs/CommandLineModules/Backend/FunctionPointer/CMakeLists.txt

@@ -42,7 +42,6 @@ ctkFunctionGetTargetLibraries(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/CommandLineModules/Backend/LocalProcess/CMakeLists.txt

@@ -41,7 +41,6 @@ ctkFunctionGetTargetLibraries(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/CommandLineModules/Backend/XMLChecker/CMakeLists.txt

@@ -37,7 +37,6 @@ ctkFunctionGetTargetLibraries(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/CommandLineModules/Core/CMakeLists.txt

@@ -87,7 +87,6 @@ ctkFunctionGetTargetLibraries(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/CommandLineModules/Frontend/QtGui/CMakeLists.txt

@@ -49,7 +49,6 @@ ctkFunctionGetTargetLibraries(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/CommandLineModules/Frontend/QtWebKit/CMakeLists.txt

@@ -42,7 +42,6 @@ ctkFunctionGetTargetLibraries(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/QtTesting/CMakeLists.txt

@@ -108,9 +108,8 @@ if (CTK_LIB_Widgets)
   set(CTK_ADD_WIDGET_EVENT_TRANSLATORS "${CTK_ADD_WIDGET_EVENT_TRANSLATORS}  this->eventTranslator()->addWidgetEventTranslator(new ctkFileDialogEventTranslator(util));\n")
 endif()
 
-set(KIT_INCLUDE_DIRECTORIES)
 foreach(libname ${CTK_ENABLED_LIBNAMES})
-  list(APPEND KIT_INCLUDE_DIRECTORIES
+  include_directories(
     ${${libname}_SOURCE_DIR}
     ${${libname}_BINARY_DIR}
     )
@@ -171,7 +170,6 @@ ctkMacroBuildLib(
   SRCS ${KIT_SRCS}
   MOC_SRCS ${KIT_MOC_SRCS}
   UI_FORMS ${KIT_UI_FORMS}
-  INCLUDE_DIRECTORIES ${KIT_INCLUDE_DIRECTORIES}
   TARGET_LIBRARIES ${KIT_target_libraries}
   RESOURCES ${KIT_resources}
   LIBRARY_TYPE ${CTK_LIBRARY_MODE}

Libs/Visualization/VTK/Core/CMakeLists.txt

@@ -64,10 +64,8 @@ if(CTK_LIB_Scripting/Python/Core AND CTK_LIB_Scripting/Python/Core_PYTHONQT_USE_
     )
 endif()
 
-set(KIT_INCLUDE_DIRECTORIES )
-
 if(CTK_LIB_Scripting/Python/Core AND CTK_LIB_Scripting/Python/Core_PYTHONQT_USE_VTK)
-  list(APPEND KIT_INCLUDE_DIRECTORIES
+  include(
     ${PYTHON_INCLUDE_DIRS}
     ${PYTHONQT_INCLUDE_DIR}
     )
@@ -143,7 +141,6 @@ ctkMacroBuildLib(
   SRCS ${KIT_SRCS}
   MOC_SRCS ${KIT_MOC_SRCS}
   UI_FORMS ${KIT_UI_FORMS}
-  INCLUDE_DIRECTORIES ${KIT_INCLUDE_DIRECTORIES}
   TARGET_LIBRARIES ${KIT_target_libraries}
   RESOURCES ${KIT_resources}
   LIBRARY_TYPE ${CTK_LIBRARY_MODE}

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

@@ -29,16 +29,12 @@ set(PLUGIN_UI_FORMS
 set(PLUGIN_resources
 )
 
-# Additional directories to include - Note that CTK_INCLUDE_LIBRARIES is already included
-set(PLUGIN_include_directories
-)
 #Compute the plugin dependencies
 ctkFunctionGetTargetLibraries(PLUGIN_target_libraries)
 
 ctkMacroBuildPlugin(
   NAME ${PROJECT_NAME}
   EXPORT_DIRECTIVE ${PLUGIN_export_directive}
-  INCLUDE_DIRECTORIES ${PLUGIN_include_directories}
   SRCS ${PLUGIN_SRCS}
   MOC_SRCS ${PLUGIN_MOC_SRCS}
   UI_FORMS ${PLUGIN_UI_FORMS}