STYLE: Update comment in CMakeLists.txt and also review ctkMacroBuildQtPlugin.cmake

CMake/ctkMacroBuildQtPlugin.cmake

@@ -2,26 +2,26 @@
 #
 #
 #
-MACRO(CtkMacroBuildQtPlugin)
-  CtkMacroParseArguments(MYQTPLUGIN
+MACRO(ctkMacroBuildQtPlugin)
+  CtkMacroParseArguments(MY
     "NAME;EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;UI_RESOURCES;LIBRARY_TYPE"
     ""
     ${ARGN}
     )
 
   # Sanity checks
-  IF(NOT DEFINED MYQTPLUGIN_NAME)
+  IF(NOT DEFINED MY_NAME)
     MESSAGE(SEND_ERROR "NAME is mandatory")
-  ENDIF(NOT DEFINED MYQTPLUGIN_NAME)
-  IF(NOT DEFINED MYQTPLUGIN_EXPORT_DIRECTIVE)
+  ENDIF(NOT DEFINED MY_NAME)
+  IF(NOT DEFINED MY_EXPORT_DIRECTIVE)
     MESSAGE(SEND_ERROR "EXPORT_DIRECTIVE is mandatory")
-  ENDIF(NOT DEFINED MYQTPLUGIN_EXPORT_DIRECTIVE)
-  IF(NOT DEFINED MYQTPLUGIN_LIBRARY_TYPE)
-    SET(MYQTPLUGIN_LIBRARY_TYPE "SHARED")
-  ENDIF(NOT DEFINED MYQTPLUGIN_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 ${MYQTPLUGIN_NAME})
+  SET(lib_name ${MY_NAME})
 
   # --------------------------------------------------------------------------
   # Include dirs
@@ -29,14 +29,14 @@ MACRO(CtkMacroBuildQtPlugin)
     ${CTK_BASE_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${MYQTPLUGIN_INCLUDE_DIRECTORIES}
+    ${MY_INCLUDE_DIRECTORIES}
     )  
   INCLUDE_DIRECTORIES(
     ${my_includes}
     )  
  
-  SET(MY_LIBRARY_EXPORT_DIRECTIVE ${MYQTPLUGIN_EXPORT_DIRECTIVE})
-  SET(MY_EXPORT_HEADER_PREFIX ${MYQTPLUGIN_NAME})
+  SET(MY_LIBRARY_EXPORT_DIRECTIVE ${MY_EXPORT_DIRECTIVE})
+  SET(MY_EXPORT_HEADER_PREFIX ${MY_NAME})
   SET(MY_LIBNAME ${lib_name})
   
   CONFIGURE_FILE(
@@ -46,42 +46,42 @@ MACRO(CtkMacroBuildQtPlugin)
   SET(dynamicHeaders
     "${dynamicHeaders};${CMAKE_CURRENT_BINARY_DIR}/${MY_EXPORT_HEADER_PREFIX}Export.h")
 
-  QT4_WRAP_CPP(MYQTPLUGIN_SRCS ${MYQTPLUGIN_MOC_SRCS})
-  QT4_WRAP_UI(MYQTPLUGIN_UI_CXX ${MYQTPLUGIN_UI_FORMS})
-  SET(MYQTPLUGIN_QRC_SRCS "")
-  IF(DEFINED MYQTPLUGIN_UI_RESOURCES)
-    QT4_ADD_RESOURCES(MYQTPLUGIN_QRC_SRCS ${MYQTPLUGIN_UI_RESOURCES})
-  ENDIF(DEFINED MYQTPLUGIN_UI_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_UI_RESOURCES)
+    QT4_ADD_RESOURCES(MY_QRC_SRCS ${MY_UI_RESOURCES})
+  ENDIF(DEFINED MY_UI_RESOURCES)
 
   SOURCE_GROUP("Resources" FILES
-    ${MYQTPLUGIN_UI_RESOURCES}
-    ${MYQTPLUGIN_UI_FORMS}
+    ${MY_UI_RESOURCES}
+    ${MY_UI_FORMS}
     )
 
   SOURCE_GROUP("Generated" FILES
-    ${MYQTPLUGIN_MOC_SRCS}
-    ${MYQTPLUGIN_QRC_SRCS}
-    ${MYQTPLUGIN_UI_CXX}
+    ${MY_MOC_SRCS}
+    ${MY_QRC_SRCS}
+    ${MY_UI_CXX}
     )
   
-  ADD_LIBRARY(${lib_name} ${MYQTPLUGIN_LIBRARY_TYPE}
-    ${MYQTPLUGIN_SRCS}
-    ${MYQTPLUGIN_UI_CXX}
-    ${MYQTPLUGIN_QRC_SRCS}
+  ADD_LIBRARY(${lib_name} ${MY_LIBRARY_TYPE}
+    ${MY_SRCS}
+    ${MY_UI_CXX}
+    ${MY_QRC_SRCS}
     )
 
   # Note: The plugin may be installed in some other location ???
   # Install rules
-  #IF(CTK_BUILD_SHARED_LIBS)
-  #  INSTALL(TARGETS ${lib_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)
+#   IF(CTK_BUILD_SHARED_LIBS)
+#     INSTALL(TARGETS ${lib_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}
-    ${MYQTPLUGIN_TARGET_LIBRARIES}
+    ${MY_TARGET_LIBRARIES}
     )
   TARGET_LINK_LIBRARIES(${lib_name} ${my_libs})
   
@@ -94,5 +94,3 @@ MACRO(CtkMacroBuildQtPlugin)
   #  )
 
 ENDMACRO()
-
-

Libs/Core/CMakeLists.txt

@@ -1,7 +1,7 @@
 PROJECT(CTKCore)
 
 #
-# See CTK/CMake/CTKBuildQtLibMacro.cmake for details
+# See CTK/CMake/ctkMacroBuildQtLib.cmake for details
 #
 
 SET(KIT_export_directive "Q_CTK_CORE_EXPORT")

Libs/DICOM/Core/CMakeLists.txt

@@ -10,7 +10,7 @@ IF(NOT DCMTK_FOUND)
 ENDIF()
 
 #
-# See CTK/CMake/CTKBuildQtLibMacro.cmake for details
+# See CTK/CMake/ctkMacroBuildQtLib.cmake for details
 #
 
 SET(KIT_export_directive "Q_CTK_DICOM_CORE_EXPORT")

Libs/DICOM/Widgets/CMakeLists.txt

@@ -1,7 +1,7 @@
 PROJECT(CTKDICOMWidgets)
 
 #
-# See CTK/CMake/CTKBuildQtLibMacro.cmake for details
+# See CTK/CMake/ctkMacroBuildQtLib.cmake for details
 #
 
 SET(KIT_export_directive "Q_CTK_DICOM_WIDGETS_EXPORT")

Libs/Widgets/CMakeLists.txt

@@ -1,7 +1,7 @@
 PROJECT(CTKWidgets)
 
 #
-# See CTK/CMake/CTKBuildQtLibMacro.cmake for details
+# See CTK/CMake/ctkMacroBuildQtLib.cmake for details
 #
 
 SET(KIT_export_directive "Q_CTK_WIDGETS_EXPORT")