Modularized itk as CTKitk, mitk as CTKmitk.

CMakeLists.txt

@@ -18,6 +18,8 @@
 #
 ###########################################################################
 
+SET(CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE} CACHE STRING "" FORCE)
+
 cmake_minimum_required(VERSION 3.0)
 
 foreach(p
@@ -325,7 +327,6 @@ set(ITK_VERSION
 # enough to distinguish available features of the toolkit.
 set(ITK_VERSION_STRING "${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}")
 
-message("ITK_VERSION:             ${ITK_VERSION}")
 #-----------------------------------------------------------------------------
 # Testing
 #
@@ -1386,6 +1387,4 @@ add_subdirectory( Documentation )
 # The commands in this directory are intended to be executed as
 # the end of the whole configuration process, as a "last step".
 # This directory is typically the last SUBDIRS in the main CMakeLists.txt.
-add_subdirectory(CMake/LastConfigureStep)
-
-#ctkDebugVariables()
+add_subdirectory(CMake/LastConfigureStep)

Libs/AppUtil/CMakeLists.txt

@@ -1,23 +1,7 @@
-#[[
-if(UNIX AND NOT APPLE)
-  set(qt5_depends "${qt5_depends}+X11Extras")
-endif()
-
-mitk_create_module(
-  PACKAGE_DEPENDS
-    PUBLIC CTK|CTKPluginFramework ${qt5_depends} Poco|Util
-    PRIVATE VTK
-  DEPENDS
-    PUBLIC qtsingleapplication
-    PRIVATE MitkCore
-)
-]]
-
 project(CTKAppUtil)
 
 include(files.cmake)
 
-find_package(CppMicroServices COMPONENTS usLogService usWebConsole usHttpService)
 #
 # See CTK/CMake/ctkMacroBuildLib.cmake for details
 #

Libs/AppUtil/mitkBaseApplication.cpp

@@ -629,10 +629,10 @@ namespace mitk
   void BaseApplication::initializeCppMicroServices()
   {
     auto storageDir = this->getProperty(ctkPluginConstants::FRAMEWORK_STORAGE).toString();
-    /*
+
     if (!storageDir.isEmpty())
       us::ModuleSettings::SetStoragePath((storageDir + "us" + QDir::separator()).toStdString());
-    */
+
   }
 
   QCoreApplication *BaseApplication::getQApplication() const

Libs/AppUtil/target_libraries.cmake

@@ -7,14 +7,22 @@
 set(target_libraries
   CTKCore
   CTKPluginFramework
+  CppMicroServices
   CTKmitk
   CTKqtsingleapplication
-  CppMicroServices
-  Qt5::Widgets Qt5::WebEngine
   Poco::Util
   )
 
-if(UNIX AND NOT APPLE)
-  set(qt5_depends {qt5_depends} X11Extras)
+
+if(CTK_QT_VERSION VERSION_GREATER "4")
+  list(APPEND target_libraries Qt5::Widgets Qt5::WebEngine)
+  if(UNIX AND NOT APPLE)
+    set(qt5_depends {qt5_depends} X11Extras)
   list(APPEND target_libraries qt5_depends)
-endif()
+endif()
+endif()
+
+if (CTK_QT_VERSION VERSION_LESS "5")
+  list(APPEND target_libraries QT_LIBRARIES)
+endif()
+

Libs/itk/CMakeLists.txt

@@ -61,8 +61,20 @@ ctkMacroBuildLib(
   MOC_SRCS ${KIT_MOC_SRCS}
   TARGET_LIBRARIES ${KIT_target_libraries}
   LIBRARY_TYPE ${CTK_LIBRARY_MODE}
+  BYPASS_REGEX TRUE
   )
 
+#[[]]
+# Extra path for linking.
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+  set(ITKSYS_PATH "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}")
+else()
+  set(ITKSYS_PATH "${CMAKE_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}")
+endif()
+
+message("ITKSYS_PATH = ${ITKSYS_PATH}")
 ctkFunctionGetTargetLibraries(itksys)
+target_link_libraries(${PROJECT_NAME} "${ITKSYS_PATH}/itksys.lib")
+
 
-target_link_libraries(${PROJECT_NAME} "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/MinSizeRel/itksys.lib")
+#ctkMacroDebugVariables()

Libs/mbilog/CMakeLists.txt

@@ -37,4 +37,16 @@ ctkMacroBuildLib(
   LIBRARY_TYPE ${CTK_LIBRARY_MODE}
   BYPASS_REGEX TRUE
   #GENERATE_EXPORT_HEADER TRUE
-  )
+  )
+
+# Extra path for linking.
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+  set(ITKSYS_PATH "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}")
+else()
+  set(ITKSYS_PATH "${CMAKE_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}")
+endif()
+
+message("ITKSYS_PATH = ${ITKSYS_PATH}")
+#[[]]
+ctkFunctionGetTargetLibraries(itksys)
+target_link_libraries(${PROJECT_NAME} "${ITKSYS_PATH}/itksys.lib")