STYLE: Rename macro ctkMacroBuildQt{Lib, App, Plugin} into ctkMacroBuild{Lib, App, Plugin}

Applications/ctkDICOM/CMakeLists.txt

@@ -1,7 +1,7 @@
 PROJECT(ctkDICOM)
 
 #
-# See CTK/CMake/ctkMacroBuildQtApp.cmake for details
+# See CTK/CMake/ctkMacroBuildApp.cmake for details
 #
   
 # Source files
@@ -29,7 +29,7 @@ ctkMacroGetTargetLibraries(KIT_target_libraries)
 SET(KIT_include_directories
   )
 
-ctkMacroBuildQtApp(
+ctkMacroBuildApp(
   NAME ${PROJECT_NAME}
   INCLUDE_DIRECTORIES ${KIT_include_directories}
   SRCS ${KIT_SRCS}

Applications/ctkDICOMIndexer/CMakeLists.txt

@@ -1,7 +1,7 @@
 PROJECT(ctkDICOMIndexer)
 
 #
-# See CTK/CMake/ctkMacroBuildQtApp.cmake for details
+# See CTK/CMake/ctkMacroBuildApp.cmake for details
 #
   
 # Source files
@@ -29,7 +29,7 @@ ctkMacroGetTargetLibraries(KIT_target_libraries)
 SET(KIT_include_directories
   )
 
-ctkMacroBuildQtApp(
+ctkMacroBuildApp(
   NAME ${PROJECT_NAME}
   INCLUDE_DIRECTORIES ${KIT_include_directories}
   SRCS ${KIT_SRCS}

CMake/ctkMacroBuildQtApp.cmake

@@ -4,7 +4,7 @@
 #  CTK/CMake/ctkMacroParseArguments.cmake
 #
 
-MACRO(CtkMacroBuildQtApp)
+MACRO(ctkMacroBuildApp)
   ctkMacroParseArguments(MY
     "NAME;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;RESOURCES"
     ""

CMake/ctkMacroBuildQtLib.cmake

@@ -4,7 +4,7 @@
 #  CTK/CMake/ctkMacroParseArguments.cmake
 #
 
-MACRO(CtkMacroBuildQtLib)
+MACRO(ctkMacroBuildLib)
   ctkMacroParseArguments(MY
     "NAME;EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;RESOURCES;LIBRARY_TYPE"
     ""

CMake/ctkMacroBuildQtPlugin.cmake

@@ -4,7 +4,7 @@
 #  CTK/CMake/ctkMacroParseArguments.cmake
 #
 
-MACRO(ctkMacroBuildQtPlugin)
+MACRO(ctkMacroBuildPlugin)
   CtkMacroParseArguments(MY
     "NAME;EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;RESOURCES;LIBRARY_TYPE"
     ""
@@ -72,6 +72,9 @@ MACRO(ctkMacroBuildQtPlugin)
     ${MY_QRC_SRCS}
     )
 
+  # Apply properties to the library target.
+  SET_TARGET_PROPERTIES(${lib_name}  PROPERTIES COMPILE_FLAGS "-DQT_PLUGIN")
+
   # Note: The plugin may be installed in some other location ???
   # Install rules
 # IF(CTK_BUILD_SHARED_LIBS)

CMake/ctkMacroBuildQtDesignerPlugin.cmake

@@ -0,0 +1,86 @@
+
+#
+# Depends on:
+#  CTK/CMake/ctkMacroParseArguments.cmake
+#
+
+MACRO(ctkMacroBuildQtDesignerPlugin)
+  CtkMacroParseArguments(MY
+    "NAME;EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;RESOURCES;LIBRARY_TYPE"
+    ""
+    ${ARGN}
+    )
+
+  # Sanity checks
+  IF(NOT DEFINED MY_NAME)
+    MESSAGE(SEND_ERROR "NAME is mandatory")
+  ENDIF()
+  IF(NOT DEFINED MY_EXPORT_DIRECTIVE)
+    MESSAGE(SEND_ERROR "EXPORT_DIRECTIVE is mandatory")
+  ENDIF()
+  IF(NOT DEFINED MY_LIBRARY_TYPE)
+    SET(MY_LIBRARY_TYPE "SHARED")
+  ENDIF()
+
+  # Define library name
+  SET(lib_name ${MY_NAME})
+
+  # --------------------------------------------------------------------------
+  # Include dirs
+  SET(my_includes
+    ${CTK_BASE_INCLUDE_DIRS}
+    ${QT_QTDESIGNER_INCLUDE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${MY_INCLUDE_DIRECTORIES}
+    )
+  INCLUDE_DIRECTORIES(
+    ${my_includes}
+    )
+ 
+  SET(MY_LIBRARY_EXPORT_DIRECTIVE ${MY_EXPORT_DIRECTIVE})
+  SET(MY_EXPORT_HEADER_PREFIX ${MY_NAME})
+  SET(MY_LIBNAME ${lib_name})
+  
+  CONFIGURE_FILE(
+    ${CTK_SOURCE_DIR}/Libs/CTKExport.h.in
+    ${CMAKE_CURRENT_BINARY_DIR}/${MY_EXPORT_HEADER_PREFIX}Export.h
+    )
+  SET(dynamicHeaders
+    "${dynamicHeaders};${CMAKE_CURRENT_BINARY_DIR}/${MY_EXPORT_HEADER_PREFIX}Export.h")
+
+  QT4_WRAP_CPP(MY_SRCS ${MY_MOC_SRCS})
+  QT4_WRAP_UI(MY_UI_CXX ${MY_UI_FORMS})
+  SET(MY_QRC_SRCS "")
+  IF(DEFINED MY_RESOURCES)
+    QT4_ADD_RESOURCES(MY_QRC_SRCS ${MY_RESOURCES})
+  ENDIF()
+
+  SOURCE_GROUP("Resources" FILES
+    ${MY_RESOURCES}
+    ${MY_UI_FORMS}
+    )
+
+  SOURCE_GROUP("Generated" FILES
+    ${MY_MOC_SRCS}
+    ${MY_QRC_SRCS}
+    ${MY_UI_CXX}
+    )
+  
+  ADD_LIBRARY(${lib_name} ${MY_LIBRARY_TYPE}
+    ${MY_SRCS}
+    ${MY_UI_CXX}
+    ${MY_QRC_SRCS}
+    )
+
+  # Apply properties to the library target.
+  SET_TARGET_PROPERTIES(${lib_name}  PROPERTIES COMPILE_FLAGS "-DQT_PLUGIN")
+  
+  SET(my_libs
+    ${MY_TARGET_LIBRARIES}
+    ${QT_QTDESIGNER_LIBRARY}
+    )
+  TARGET_LINK_LIBRARIES(${lib_name} ${my_libs})
+
+ENDMACRO()
+

CMakeLists.txt

@@ -71,9 +71,9 @@ SET(CTK_BASE_INCLUDE_DIRS CACHE INTERNAL "CTK includes" FORCE)
 #
 INCLUDE(CMake/ctkMacroParseArguments.cmake)
 INCLUDE(CMake/ctkMacroListFilter.cmake)
-INCLUDE(CMake/ctkMacroBuildQtLib.cmake)
-INCLUDE(CMake/ctkMacroBuildQtPlugin.cmake)
-INCLUDE(CMake/ctkMacroBuildQtApp.cmake)
+INCLUDE(CMake/ctkMacroBuildLib.cmake)
+INCLUDE(CMake/ctkMacroBuildPlugin.cmake)
+INCLUDE(CMake/ctkMacroBuildApp.cmake)
 INCLUDE(CMake/ctkMacroSetupQt.cmake)
 INCLUDE(CMake/ctkMacroTargetLibraries.cmake) # Import multiple macros
 INCLUDE(CMake/ctkMacroAddCtkLibraryOptions.cmake)

Libs/Core/CMakeLists.txt

@@ -33,7 +33,7 @@ IF(QTMOBILITY_QTSERVICEFW_LIBRARY_DEBUG)
 ENDIF()
 
 #
-# See CTK/CMake/ctkMacroBuildQtLib.cmake for details
+# See CTK/CMake/ctkMacroBuildLib.cmake for details
 #
 
 SET(KIT_export_directive "CTK_CORE_EXPORT")
@@ -91,7 +91,7 @@ SET(KIT_resources
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
 ctkMacroGetTargetLibraries(KIT_target_libraries)
 
-ctkMacroBuildQtLib(
+ctkMacroBuildLib(
   NAME ${PROJECT_NAME}
   EXPORT_DIRECTIVE ${KIT_export_directive}
   INCLUDE_DIRECTORIES ${KIT_include_directories}

Libs/DICOM/Core/CMakeLists.txt

@@ -10,7 +10,7 @@ IF(NOT DCMTK_FOUND)
 ENDIF()
 
 #
-# See CTK/CMake/ctkMacroBuildQtLib.cmake for details
+# See CTK/CMake/ctkMacroBuildLib.cmake for details
 #
 
 SET(KIT_export_directive "CTK_DICOM_CORE_EXPORT")
@@ -49,7 +49,7 @@ SET(KIT_resources
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
 ctkMacroGetTargetLibraries(KIT_target_libraries)
 
-ctkMacroBuildQtLib(
+ctkMacroBuildLib(
   NAME ${PROJECT_NAME}
   EXPORT_DIRECTIVE ${KIT_export_directive}
   INCLUDE_DIRECTORIES ${KIT_include_directories}

Libs/DICOM/Widgets/CMakeLists.txt

@@ -1,7 +1,7 @@
 PROJECT(CTKDICOMWidgets)
 
 #
-# See CTK/CMake/ctkMacroBuildQtLib.cmake for details
+# See CTK/CMake/ctkMacroBuildLib.cmake for details
 #
 
 SET(KIT_export_directive "CTK_DICOM_WIDGETS_EXPORT")
@@ -48,7 +48,7 @@ SET(KIT_resources
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
 ctkMacroGetTargetLibraries(KIT_target_libraries)
 
-ctkMacroBuildQtLib(
+ctkMacroBuildLib(
   NAME ${PROJECT_NAME}
   EXPORT_DIRECTIVE ${KIT_export_directive}
   INCLUDE_DIRECTORIES ${KIT_include_directories}

Libs/Visualization/VTK/Core/CMakeLists.txt

@@ -12,7 +12,7 @@ ENDIF()
 INCLUDE(${VTK_USE_FILE})
 
 #
-# See CTK/CMake/ctkMacroBuildQtLib.cmake for details
+# See CTK/CMake/ctkMacroBuildLib.cmake for details
 #
 
 SET(KIT_export_directive "CTK_VISUALIZATION_VTK_CORE_EXPORT")
@@ -59,7 +59,7 @@ SET(VTK_LIBRARIES
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
 ctkMacroGetTargetLibraries(KIT_target_libraries)
 
-ctkMacroBuildQtLib(
+ctkMacroBuildLib(
   NAME ${PROJECT_NAME}
   EXPORT_DIRECTIVE ${KIT_export_directive}
   INCLUDE_DIRECTORIES ${KIT_include_directories}

Libs/Visualization/VTK/Widgets/CMakeLists.txt

@@ -12,7 +12,7 @@ ENDIF()
 INCLUDE(${VTK_USE_FILE})
 
 #
-# See CTK/CMake/ctkMacroBuildQtLib.cmake for details
+# See CTK/CMake/ctkMacroBuildLib.cmake for details
 #
 
 SET(KIT_export_directive "CTK_VISUALIZATION_VTK_WIDGETS_EXPORT")
@@ -53,7 +53,7 @@ SET(VTK_LIBRARIES
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
 ctkMacroGetTargetLibraries(KIT_target_libraries)
 
-ctkMacroBuildQtLib(
+ctkMacroBuildLib(
   NAME ${PROJECT_NAME}
   EXPORT_DIRECTIVE ${KIT_export_directive}
   INCLUDE_DIRECTORIES ${KIT_include_directories}

Libs/Visualization/XIP/CMakeLists.txt

@@ -10,7 +10,7 @@ PROJECT(CTKVisualizationXIP)
 # ENDIF()
 
 #
-# See CTK/CMake/ctkMacroBuildQtLib.cmake for details
+# See CTK/CMake/ctkMacroBuildLib.cmake for details
 #
 
 SET(KIT_export_directive "CTK_VISUALIZATION_XIP_EXPORT")
@@ -43,7 +43,7 @@ SET(KIT_resources
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
 ctkMacroGetTargetLibraries(KIT_target_libraries)
 
-ctkMacroBuildQtLib(
+ctkMacroBuildLib(
   NAME ${PROJECT_NAME}
   EXPORT_DIRECTIVE ${KIT_export_directive}
   INCLUDE_DIRECTORIES ${KIT_include_directories}

Libs/Widgets/CMakeLists.txt

@@ -1,7 +1,7 @@
 PROJECT(CTKWidgets)
 
 #
-# See CTK/CMake/ctkMacroBuildQtLib.cmake for details
+# See CTK/CMake/ctkMacroBuildLib.cmake for details
 #
 
 SET(KIT_export_directive "CTK_WIDGETS_EXPORT")
@@ -12,6 +12,8 @@ SET(KIT_include_directories
   
 # Source files
 SET(KIT_SRCS
+  ctkColorPickerButton.cpp
+  ctkColorPickerButton.h
   ctkMatrixWidget.cpp
   ctkMatrixWidget.h
   ctkSettings.cpp
@@ -24,6 +26,7 @@ SET(KIT_SRCS
 
 # Headers that should run through moc
 SET(KIT_MOC_SRCS
+  ctkColorPickerButton.h
   ctkMatrixWidget.h
   ctkSettings.h
   ctkTransferFunctionItems.h
@@ -42,7 +45,7 @@ SET(KIT_resources
 # The following macro will read the target libraries from the file 'target_libraries.cmake'
 ctkMacroGetTargetLibraries(KIT_target_libraries)
 
-ctkMacroBuildQtLib(
+ctkMacroBuildLib(
   NAME ${PROJECT_NAME}
   EXPORT_DIRECTIVE ${KIT_export_directive}
   INCLUDE_DIRECTORIES ${KIT_include_directories}
@@ -55,7 +58,7 @@ ctkMacroBuildQtLib(
   )
 
 # Plugins
-#ADD_SUBDIRECTORY(Plugins)
+ADD_SUBDIRECTORY(Plugins)
 
 # Testing
 IF(BUILD_TESTING)