ENH: Added macro ctkMacroBuildQtApp.cmake

Applications/ctkDICOM/CMakeLists.txt

@@ -1,13 +1,45 @@
+PROJECT(ctkDICOM)
 
-INCLUDE_DIRECTORIES(${CTK_BASE_INCLUDE_DIRS})
-# Create executable
-ADD_EXECUTABLE(ctkDICOM
+#
+# See CTK/CMake/ctkMacroBuildQtApp.cmake for details
+#
+  
+# Source files
+SET(KIT_SRCS
   ctkDICOM.cxx
+  )
+
+# Headers that should run through moc
+SET(KIT_MOC_SRCS
+  )
+
+# UI files
+SET(KIT_UI_FORMS
+)
+
+# Resources
+SET(KIT_resources
 )
 
-SET(KIT_LIBRARIES
-  ${CTK_BASE_LIBRARIES}
-  ${QT_LIBRARIES}
+# Additional target libraries - Note that CTK_BASE_LIBRARIES is already included
+SET(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}
   )
 
-TARGET_LINK_LIBRARIES(ctkDICOM ${KIT_LIBRARIES})
+# Testing
+IF(BUILD_TESTING)
+#   ADD_SUBDIRECTORY(Testing)
+ENDIF(BUILD_TESTING)

CMake/ctkMacroBuildQtApp.cmake

@@ -0,0 +1,105 @@
+
+#
+#
+#
+MACRO(CtkMacroBuildQtApp)
+  ctkMacroParseArguments(MY
+    "NAME;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;RESOURCES"
+    ""
+    ${ARGN}
+    )
+
+  # Sanity checks
+  IF(NOT DEFINED MY_NAME)
+    MESSAGE(SEND_ERROR "NAME is mandatory")
+  ENDIF(NOT DEFINED MY_NAME)
+#   IF(NOT DEFINED MY_EXPORT_DIRECTIVE)
+#     MESSAGE(SEND_ERROR "EXPORT_DIRECTIVE is mandatory")
+#   ENDIF(NOT DEFINED MY_EXPORT_DIRECTIVE)
+#   IF(NOT DEFINED MY_LIBRARY_TYPE)
+#     SET(MY_LIBRARY_TYPE "SHARED")
+#   ENDIF(NOT DEFINED MY_LIBRARY_TYPE)
+
+  # Define library name
+  SET(proj_name ${MY_NAME})
+
+  # --------------------------------------------------------------------------
+  # Include dirs
+  SET(my_includes
+    ${CTK_BASE_INCLUDE_DIRS}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${MY_INCLUDE_DIRECTORIES}
+    )  
+  SET(CTK_BASE_INCLUDE_DIRS ${my_includes} CACHE INTERNAL "CTK includes" FORCE)
+  INCLUDE_DIRECTORIES(${CTK_BASE_INCLUDE_DIRS}) 
+
+#   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(DEFINED MY_RESOURCES)
+
+  SOURCE_GROUP("Resources" FILES
+    ${MY_RESOURCES}
+    ${MY_UI_FORMS}
+    )
+
+  SOURCE_GROUP("Generated" FILES
+    ${MY_MOC_SRCS}
+    ${MY_QRC_SRCS}
+    ${MY_UI_CXX}
+    )
+
+  # Create executable
+  ADD_EXECUTABLE(${proj_name}
+    ${MY_SRCS}
+    ${MY_UI_CXX}
+    ${MY_QRC_SRCS}
+    )
+#   ADD_LIBRARY(${lib_name} ${MY_LIBRARY_TYPE}
+#     ${MY_SRCS}
+#     ${MY_UI_CXX}
+#     ${MY_QRC_SRCS}
+#     )
+
+  # Install rules
+  IF(CTK_BUILD_SHARED_LIBS)
+    INSTALL(TARGETS ${proj_name}
+      RUNTIME DESTINATION ${CTK_INSTALL_BIN_DIR} COMPONENT Runtime
+      LIBRARY DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Runtime
+      ARCHIVE DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Development)
+  ENDIF(CTK_BUILD_SHARED_LIBS)
+  
+  SET(my_libs
+    ${CTK_BASE_LIBRARIES}
+    ${MY_TARGET_LIBRARIES}
+    )
+  TARGET_LINK_LIBRARIES(${proj_name} ${my_libs})
+
+  # Update CTK_BASE_LIBRARIES
+#   SET(CTK_BASE_LIBRARIES ${my_libs} ${lib_name} CACHE INTERNAL "CTK libraries" FORCE)
+  
+  # Install headers
+  FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+  INSTALL(FILES
+    ${headers}
+    ${dynamicHeaders}
+    DESTINATION ${CTK_INSTALL_INCLUDE_DIR} COMPONENT Development
+    )
+
+ENDMACRO()
+
+

CMake/ctkMacroBuildQtLib.cmake

@@ -3,25 +3,25 @@
 #
 #
 MACRO(CtkMacroBuildQtLib)
-  ctkMacroParseArguments(MYQTLIB
+  ctkMacroParseArguments(MY
     "NAME;EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;RESOURCES;LIBRARY_TYPE"
     ""
     ${ARGN}
     )
 
   # Sanity checks
-  IF(NOT DEFINED MYQTLIB_NAME)
+  IF(NOT DEFINED MY_NAME)
     MESSAGE(SEND_ERROR "NAME is mandatory")
-  ENDIF(NOT DEFINED MYQTLIB_NAME)
-  IF(NOT DEFINED MYQTLIB_EXPORT_DIRECTIVE)
+  ENDIF(NOT DEFINED MY_NAME)
+  IF(NOT DEFINED MY_EXPORT_DIRECTIVE)
     MESSAGE(SEND_ERROR "EXPORT_DIRECTIVE is mandatory")
-  ENDIF(NOT DEFINED MYQTLIB_EXPORT_DIRECTIVE)
-  IF(NOT DEFINED MYQTLIB_LIBRARY_TYPE)
-    SET(MYQTLIB_LIBRARY_TYPE "SHARED")
-  ENDIF(NOT DEFINED MYQTLIB_LIBRARY_TYPE)
+  ENDIF(NOT DEFINED MY_EXPORT_DIRECTIVE)
+  IF(NOT DEFINED MY_LIBRARY_TYPE)
+    SET(MY_LIBRARY_TYPE "SHARED")
+  ENDIF(NOT DEFINED MY_LIBRARY_TYPE)
 
   # Define library name
-  SET(lib_name ${MYQTLIB_NAME})
+  SET(lib_name ${MY_NAME})
 
   # --------------------------------------------------------------------------
   # Include dirs
@@ -29,16 +29,13 @@ MACRO(CtkMacroBuildQtLib)
     ${CTK_BASE_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${MYQTLIB_INCLUDE_DIRECTORIES}
+    ${MY_INCLUDE_DIRECTORIES}
     )  
   SET(CTK_BASE_INCLUDE_DIRS ${my_includes} CACHE INTERNAL "CTK includes" FORCE)
-  INCLUDE_DIRECTORIES(
-    ${CTK_BASE_INCLUDE_DIRS}
-    
-    )  
+  INCLUDE_DIRECTORIES(${CTK_BASE_INCLUDE_DIRS})
 
-  SET(MY_LIBRARY_EXPORT_DIRECTIVE ${MYQTLIB_EXPORT_DIRECTIVE})
-  SET(MY_EXPORT_HEADER_PREFIX ${MYQTLIB_NAME})
+  SET(MY_LIBRARY_EXPORT_DIRECTIVE ${MY_EXPORT_DIRECTIVE})
+  SET(MY_EXPORT_HEADER_PREFIX ${MY_NAME})
   SET(MY_LIBNAME ${lib_name})
   
   CONFIGURE_FILE(
@@ -48,28 +45,28 @@ MACRO(CtkMacroBuildQtLib)
   SET(dynamicHeaders
     "${dynamicHeaders};${CMAKE_CURRENT_BINARY_DIR}/${MY_EXPORT_HEADER_PREFIX}Export.h")
 
-  QT4_WRAP_CPP(MYQTLIB_SRCS ${MYQTLIB_MOC_SRCS})
-  QT4_WRAP_UI(MYQTLIB_UI_CXX ${MYQTLIB_UI_FORMS})
-  SET(MYQTLIB_QRC_SRCS "")
-  IF(DEFINED MYQTLIB_RESOURCES)
-    QT4_ADD_RESOURCES(MYQTLIB_QRC_SRCS ${MYQTLIB_RESOURCES})
-  ENDIF(DEFINED MYQTLIB_RESOURCES)
+  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(DEFINED MY_RESOURCES)
 
   SOURCE_GROUP("Resources" FILES
-    ${MYQTLIB_RESOURCES}
-    ${MYQTLIB_UI_FORMS}
+    ${MY_RESOURCES}
+    ${MY_UI_FORMS}
     )
 
   SOURCE_GROUP("Generated" FILES
-    ${MYQTLIB_MOC_SRCS}
-    ${MYQTLIB_QRC_SRCS}
-    ${MYQTLIB_UI_CXX}
+    ${MY_MOC_SRCS}
+    ${MY_QRC_SRCS}
+    ${MY_UI_CXX}
     )
   
-  ADD_LIBRARY(${lib_name} ${MYQTLIB_LIBRARY_TYPE}
-    ${MYQTLIB_SRCS}
-    ${MYQTLIB_UI_CXX}
-    ${MYQTLIB_QRC_SRCS}
+  ADD_LIBRARY(${lib_name} ${MY_LIBRARY_TYPE}
+    ${MY_SRCS}
+    ${MY_UI_CXX}
+    ${MY_QRC_SRCS}
     )
 
   # Install rules
@@ -81,7 +78,7 @@ MACRO(CtkMacroBuildQtLib)
   ENDIF(CTK_BUILD_SHARED_LIBS)
   
   SET(my_libs
-    ${MYQTLIB_TARGET_LIBRARIES}
+    ${MY_TARGET_LIBRARIES}
     )
   TARGET_LINK_LIBRARIES(${lib_name} ${my_libs})
 

CMakeLists.txt

@@ -46,6 +46,7 @@ SET(CTK_BASE_INCLUDE_DIRS CACHE INTERNAL "CTK includes" FORCE)
 INCLUDE(CMake/ctkMacroParseArguments.cmake)
 INCLUDE(CMake/ctkMacroBuildQtLib.cmake)
 INCLUDE(CMake/ctkMacroBuildQtPlugin.cmake)
+INCLUDE(CMake/ctkMacroBuildQtApp.cmake)
 INCLUDE(CMake/ctkMacroSetupQt.cmake)
 INCLUDE(CMake/ctkMacroGetTargetLibraries.cmake)