ENH: CTK CMake macro are now prefixed with "ctkMacro...". Also rename the cmake file name for consistency.

CMake/CTKBuildQtLibMacro.cmake

@@ -2,8 +2,8 @@
 #
 #
 #
-MACRO(ctk_build_qtlib)
-  CTK_PARSE_ARGUMENTS(MYQTLIB
+MACRO(CtkMacroBuildQtLib)
+  CtkMacroParseArguments(MYQTLIB
     "NAME;EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;RESOURCES;LIBRARY_TYPE"
     ""
     ${ARGN}
@@ -96,6 +96,6 @@ MACRO(ctk_build_qtlib)
     DESTINATION ${CTK_INSTALL_INCLUDE_DIR} COMPONENT Development
     )
 
-ENDMACRO(ctk_build_qtlib)
+ENDMACRO(CtkMacroBuildQtLib)
 
 

CMake/CTKBuildQtPluginMacro.cmake

@@ -2,8 +2,8 @@
 #
 #
 #
-MACRO(ctk_build_qtplugin)
-  CTK_PARSE_ARGUMENTS(MYQTPLUGIN
+MACRO(CtkMacroBuildQtPlugin)
+  CtkMacroParseArguments(MYQTPLUGIN
     "NAME;EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;UI_RESOURCES;LIBRARY_TYPE"
     ""
     ${ARGN}
@@ -93,6 +93,6 @@ MACRO(ctk_build_qtplugin)
   #  DESTINATION ${CTK_INSTALL_INCLUDE_DIR} COMPONENT Development
   #  )
 
-ENDMACRO(ctk_build_qtplugin)
+ENDMACRO(CtkMacroBuildQtPlugin)
 
 

CMake/CTKParseArgumentsMacro.cmake

@@ -2,7 +2,7 @@
 #
 # See http://www.cmake.org/Wiki/CMakeMacroParseArguments
 #
-MACRO(CTK_PARSE_ARGUMENTS prefix arg_names option_names)
+MACRO(CtkMacroParseArguments prefix arg_names option_names)
   SET(DEFAULT_ARGS)
   FOREACH(arg_name ${arg_names})
     SET(${prefix}_${arg_name})
@@ -31,4 +31,4 @@ MACRO(CTK_PARSE_ARGUMENTS prefix arg_names option_names)
     ENDIF (is_arg_name GREATER -1)
   ENDFOREACH(arg)
   SET(${prefix}_${current_arg_name} ${current_arg_list})
-ENDMACRO(CTK_PARSE_ARGUMENTS)
+ENDMACRO(CtkMacroParseArguments)

CMake/CTKSetupQt.cmake

@@ -5,7 +5,7 @@
 #
 
 
-MACRO(ctk_setup_qt)
+MACRO(ctkMacroSetupQt)
 
   IF(DEFINED CTK_QMAKE_EXECUTABLE)
     SET(QT_QMAKE_EXECUTABLE ${CTK_QMAKE_EXECUTABLE})
@@ -30,4 +30,4 @@ MACRO(ctk_setup_qt)
     MESSAGE(FATAL_ERROR "error: Qt4 was not found on your system. You probably need to set the QT_QMAKE_EXECUTABLE variable")
   ENDIF(QT4_FOUND)
 
-ENDMACRO(ctk_setup_qt)
+ENDMACRO(ctkMacroSetupQt)

CMakeLists.txt

@@ -43,10 +43,10 @@ SET(CTK_BASE_INCLUDE_DIRS CACHE INTERNAL "CTK includes" FORCE)
 #-----------------------------------------------------------------------------
 # CMake Macro(s)
 # 
-INCLUDE(CMake/CTKParseArgumentsMacro.cmake)
-INCLUDE(CMake/CTKBuildQtLibMacro.cmake)
-INCLUDE(CMake/CTKBuildQtPluginMacro.cmake)
-INCLUDE(CMake/CTKSetupQt.cmake)
+INCLUDE(CMake/ctkMacroParseArguments.cmake)
+INCLUDE(CMake/ctkMacroBuildQtLib.cmake)
+INCLUDE(CMake/ctkMacroBuildQtPlugin.cmake)
+INCLUDE(CMake/ctkMacroSetupQt.cmake)
 
 #-----------------------------------------------------------------------------
 # Testing
@@ -87,7 +87,7 @@ ENDIF()
 #-----------------------------------------------------------------------------
 # QT
 #
-ctk_setup_qt()
+ctkMacroSetupQt()
 
 #-----------------------------------------------------------------------------
 # CTK Libraries

Libs/Core/CMakeLists.txt

@@ -33,7 +33,7 @@ SET(KIT_target_libraries
   ${QT_LIBRARIES}
   )
 
-ctk_build_qtlib(
+ctkMacroBuildQtLib(
   NAME ${PROJECT_NAME}
   EXPORT_DIRECTIVE ${KIT_export_directive}
   INCLUDE_DIRECTORIES ${KIT_include_directories}

Libs/DICOM/Core/CMakeLists.txt

@@ -38,7 +38,7 @@ SET(KIT_target_libraries
   CTKCore
   )
 
-ctk_build_qtlib(
+ctkMacroBuildQtLib(
   NAME ${PROJECT_NAME}
   EXPORT_DIRECTIVE ${KIT_export_directive}
   INCLUDE_DIRECTORIES ${KIT_include_directories}

Libs/DICOM/Widgets/CMakeLists.txt

@@ -41,7 +41,7 @@ SET(KIT_target_libraries
   CTKDICOMCore
   )
 
-ctk_build_qtlib(
+ctkMacroBuildQtLib(
   NAME ${PROJECT_NAME}
   EXPORT_DIRECTIVE ${KIT_export_directive}
   INCLUDE_DIRECTORIES ${KIT_include_directories}

Libs/Widgets/CMakeLists.txt

@@ -34,7 +34,7 @@ SET(KIT_target_libraries
   CTKCore
   )
 
-ctk_build_qtlib(
+ctkMacroBuildQtLib(
   NAME ${PROJECT_NAME}
   EXPORT_DIRECTIVE ${KIT_export_directive}
   INCLUDE_DIRECTORIES ${KIT_include_directories}