FIX: plugin-framework: adapt build-system

Adapting the plugin build system to changes introduced by merging the master branch

Applications/ctkCLIPluginExplorer/CMakeLists.txt

@@ -1,9 +1,44 @@
+PROJECT(ctkCLIPluginExplorer)
 
-SET(app_srcs
+#
+# See CTK/CMake/ctkMacroBuildQtApp.cmake for details
+#
+
+SET(KIT_SRCS
   ctkCLIPluginExplorer.cxx
 )
 
-CtkMacroBuildQtApp(
-  NAME CLIPluginExplorer
-  SRCS ${app_srcs}
-)
+# Headers that should run through moc
+SET(KIT_MOC_SRCS
+  )
+
+# UI files
+SET(KIT_UI_FORMS
+)
+
+# Resources
+SET(KIT_resources
+)
+
+# Target libraries - See CMake/ctkMacroGetTargetLibraries.cmake
+# 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
+  )
+
+ctkMacroBuildQtApp(
+  NAME ${PROJECT_NAME}
+  INCLUDE_DIRECTORIES ${KIT_include_directories}
+  SRCS ${KIT_SRCS}
+  MOC_SRCS ${KIT_MOC_SRCS}
+  UI_FORMS ${KIT_UI_FORMS}
+  TARGET_LIBRARIES ${KIT_target_libraries}
+  RESOURCES ${KIT_resources}
+  )
+
+# Testing
+IF(BUILD_TESTING)
+#   ADD_SUBDIRECTORY(Testing)
+ENDIF(BUILD_TESTING)

Applications/ctkCLIPluginExplorer/ctkCLIPluginExplorer.cxx

@@ -14,7 +14,7 @@ int main(int argc, char** argv)
   QCoreApplication app(argc, argv);
 
   ctk::PluginManager pluginManager;
-  pluginManager.addSearchPath("C:\\development\\CTK-pluginfw\\CTK-build\\bin\\Plugins");
+  pluginManager.addSearchPath("/home/sascha/git/CTK-bin/CTK-build/bin/Plugins");
   pluginManager.startAllPlugins();
 
   qDebug() << "List of services: " <<  pluginManager.serviceManager()->findServices();

Applications/ctkCLIPluginExplorer/target_libraries.cmake

@@ -0,0 +1,9 @@
+#
+# See CMake/ctkMacroGetTargetLibraries.cmake
+# 
+# This file should list the libraries required to build the current CTK application.
+# 
+
+SET(target_libraries
+  CTKCore
+  )

CMake/ctkMacroBuildQtPlugin.cmake

@@ -6,7 +6,7 @@
 
 MACRO(ctkMacroBuildQtPlugin)
   CtkMacroParseArguments(MY
-    "NAME;EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;UI_RESOURCES;QRC_FILES;LIBRARY_TYPE"
+    "NAME;EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;RESOURCES;LIBRARY_TYPE"
     ""
     ${ARGN}
     )
@@ -51,12 +51,12 @@ MACRO(ctkMacroBuildQtPlugin)
   QT4_WRAP_CPP(MY_SRCS ${MY_MOC_SRCS})
   QT4_WRAP_UI(MY_UI_CXX ${MY_UI_FORMS})
   SET(MY_QRC_SRCS "")
-  IF(DEFINED MY_QRC_FILES)
-    QT4_ADD_RESOURCES(MY_QRC_SRCS ${MY_QRC_FILES})
+  IF(DEFINED MY_RESOURCES)
+    QT4_ADD_RESOURCES(MY_QRC_SRCS ${MY_RESOURCES})
   ENDIF()
 
   SOURCE_GROUP("Resources" FILES
-    ${MY_UI_RESOURCES}
+    ${MY_RESOURCES}
     ${MY_UI_FORMS}
     )
 
@@ -82,7 +82,6 @@ MACRO(ctkMacroBuildQtPlugin)
 #   ENDIF()
   
   SET(my_libs
-    ${CTK_BASE_LIBRARIES}
     ${MY_TARGET_LIBRARIES}
     )
   TARGET_LINK_LIBRARIES(${lib_name} ${my_libs})

CMakeLists.txt

@@ -128,7 +128,7 @@ SET(ctk_libs
 # CTK Plugins
 #
 SET(ctk_plugins
-  #org.commontk.cli
+  org.commontk.cli
   )
 
 #-----------------------------------------------------------------------------

Plugins/org.commontk.cli/CMakeLists.txt

@@ -1,23 +1,28 @@
+PROJECT(org_commontk_cli)
 
+SET(PLUGIN_export_directive "org_commontk_cli_EXPORT")
 
-SET(plugin_srcs
+SET(PLUGIN_SRCS
   ctkCLIPlugin.cxx
 )
 
-SET(plugin_moc
+SET(PLUGIN_MOC_SRCS
   ctkCLIPlugin.h
 )
 
-SET(plugin_qrc_files
+SET(PLUGIN_resources
   org_commontk_cli.qrc
 )
 
 SET(LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_PATH}/Plugins)
 
-CtkMacroBuildQtPlugin(
-  NAME org_commontk_cli
-  SRCS ${plugin_srcs}
-  MOC_SRCS ${plugin_moc}
-  QRC_FILES ${plugin_qrc_files}
-  EXPORT_DIRECTIVE "org_commontk_cli_EXPORT"
-)
+ctkMacroGetTargetLibraries(PLUGIN_target_libraries)
+
+ctkMacroBuildQtPlugin(
+  NAME ${PROJECT_NAME}
+  EXPORT_DIRECTIVE ${PLUGIN_export_directive}
+  SRCS ${PLUGIN_SRCS}
+  MOC_SRCS ${PLUGIN_MOC_SRCS}
+  RESOURCES ${PLUGIN_resources}
+  TARGET_LIBRARIES ${PLUGIN_target_libraries}
+)

Plugins/org.commontk.cli/target_libraries.cmake

@@ -0,0 +1,9 @@
+#
+# See CMake/ctkMacroGetTargetLibraries.cmake
+# 
+# This file should list the libraries required to build the current CTK application.
+# 
+
+SET(target_libraries
+  CTKCore
+  )