ENH: Main CMakeLists.txt is now managing CTK Plugins

CMakeLists.txt

@@ -99,6 +99,13 @@ SET(ctk_libs
   DICOM/Core
   DICOM/Widgets
   DICOM/Applications)
+
+#-----------------------------------------------------------------------------
+# CTK Plugins
+#
+SET(ctk_plugins
+  org.commontk.cli
+  )
   
 #-----------------------------------------------------------------------------
 # To make options show up in both CTK-SuperBuild and CTK regular build, let's add them
@@ -113,11 +120,16 @@ MARK_AS_ADVANCED(DART_TESTING_TIMEOUT)
 OPTION(CTK_USE_KWSTYLE     "Enable sourcecode-based style tests." OFF)
 #MARK_AS_ADVANCED(CTK_USE_KWSTYLE)
 
-# Build options
+# Build options associated with CTK libraries
 FOREACH(lib ${ctk_libs})
   OPTION(CTK_ENABLE_${lib} "Enable ${lib} Support." ON)
 ENDFOREACH()
 
+# Build options associated with CTK plugins
+FOREACH(plugin ${ctk_plugins})
+  OPTION(CTK_ENABLE_${plugin} "Enable ${plugin} Support." ON)
+ENDFOREACH()
+
 #-----------------------------------------------------------------------------
 # Superbuild is used by default
 #
@@ -130,7 +142,7 @@ IF(CTK_SUPERBUILD)
 ENDIF()
 
 #-----------------------------------------------------------------------------
-# Add subdirectories
+# Add CTK libraries subdirectories
 #
 FOREACH(lib ${ctk_libs})
   IF (CTK_ENABLE_${lib})
@@ -138,6 +150,18 @@ FOREACH(lib ${ctk_libs})
   ENDIF()
 ENDFOREACH()
 
+#-----------------------------------------------------------------------------
+# Add CTK plugins subdirectories
+#
+FOREACH(plugin ${ctk_plugins})
+  IF (CTK_ENABLE_${plugin})
+    ADD_SUBDIRECTORY(Plugins/${plugin})
+  ENDIF()
+ENDFOREACH()
+
+#-----------------------------------------------------------------------------
+# Add general purpose subdirectories
+#
 ADD_SUBDIRECTORY(Applications)
 ADD_SUBDIRECTORY(Testing)
 ADD_SUBDIRECTORY(Examples)

SuperBuild.cmake

@@ -19,6 +19,7 @@ SET_PROPERTY(DIRECTORY PROPERTY EP_BASE ${ep_base})
 
 SET(ep_install_dir ${ep_base}/Install)
 SET(ep_build_dir ${ep_base}/Build)
+SET(ep_source_dir ${ep_base}/Source)
 #SET(ep_parallelism_level)
 SET(ep_build_shared_libs ON)
 SET(ep_build_testing OFF)
@@ -69,6 +70,24 @@ IF (CTK_USE_KWSTYLE)
 ENDIF()
 
 #-----------------------------------------------------------------------------
+# PythonQt
+#
+SET (PythonQt_DEPENDS)
+# IF ()
+#   SET(proj PythonQt)
+#   SET(PythonQt_DEPENDS ${proj})
+#   ExternalProject_Add(${proj}
+#       SVN_REPOSITORY "https://pythonqt.svn.sourceforge.net/svnroot/pythonqt/trunk"
+#       CMAKE_GENERATOR ${gen}
+#       PATCH_COMMAND ${CMAKE_COMMAND} -P ${pythonqt_patch_script}
+#       CMAKE_ARGS
+#         ${ep_common_args}
+#         -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
+#         #${vtk_PYTHON_ARGS}
+#       INSTALL_COMMAND "")
+# ENDIF()
+    
+#-----------------------------------------------------------------------------
 # Utilities/DCMTK
 #
 SET (DCMTK_DEPENDS)
@@ -111,8 +130,22 @@ ExternalProject_Add(${proj}
     CMAKE_ARGS
       ${ep_common_args}
     )
-    
-    
+
+#-----------------------------------------------------------------------------
+# XIP
+#
+# SET(proj XIP)
+# SET(url https://collab01a.scr.siemens.com/svn/xip/releases/latest)
+# ExternalProject_Add(${proj}
+#    DOWNLOAD_COMMAND "${CMAKE_COMMAND} -E ${SVNCOMMAND} checkout ${url} ${ep_source_dir}/${proj} --username=anonymous "
+#    UPDATE_COMMAND ""
+#    #SVN_REPOSITORY "https://anonymous@collab01a.scr.siemens.com/svn/xip/releases/latest"
+#    INSTALL_COMMAND ""
+#    CMAKE_GENERATOR ${gen}
+#    CMAKE_ARGS
+#      ${ep_common_args}
+#    )
+   
 #-----------------------------------------------------------------------------
 # CTK Utilities
 #
@@ -125,8 +158,10 @@ ExternalProject_Add(${proj}
   DEPENDS
     ${kwstyle_DEPENDS}
     ${DCMTK_DEPENDS}
+    ${PythonQt_DEPENDS}
     "ZMQ"
     "OpenIGTLink"
+#     "XIP"
 )
   
 #-----------------------------------------------------------------------------