浏览代码

STYLE: Update CMake macros - Added comments and remove extra test in ENDIF() statement.

Jean-Christophe Fillion-Robin 15 年之前
父节点
当前提交
beed16b255

+ 8 - 6
CMake/ctkMacroBuildQtApp.cmake

@@ -1,7 +1,9 @@
 
 #
+# Depends on:
+#  CTK/CMake/ctkMacroParseArguments.cmake
 #
-#
+
 MACRO(CtkMacroBuildQtApp)
   ctkMacroParseArguments(MY
     "NAME;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;RESOURCES"
@@ -12,13 +14,13 @@ MACRO(CtkMacroBuildQtApp)
   # Sanity checks
   IF(NOT DEFINED MY_NAME)
     MESSAGE(SEND_ERROR "NAME is mandatory")
-  ENDIF(NOT DEFINED MY_NAME)
+  ENDIF()
 #   IF(NOT DEFINED MY_EXPORT_DIRECTIVE)
 #     MESSAGE(SEND_ERROR "EXPORT_DIRECTIVE is mandatory")
-#   ENDIF(NOT DEFINED MY_EXPORT_DIRECTIVE)
+#   ENDIF()
 #   IF(NOT DEFINED MY_LIBRARY_TYPE)
 #     SET(MY_LIBRARY_TYPE "SHARED")
-#   ENDIF(NOT DEFINED MY_LIBRARY_TYPE)
+#   ENDIF()
 
   # Define library name
   SET(proj_name ${MY_NAME})
@@ -50,7 +52,7 @@ MACRO(CtkMacroBuildQtApp)
   SET(MY_QRC_SRCS "")
   IF(DEFINED MY_RESOURCES)
     QT4_ADD_RESOURCES(MY_QRC_SRCS ${MY_RESOURCES})
-  ENDIF(DEFINED MY_RESOURCES)
+  ENDIF()
 
   SOURCE_GROUP("Resources" FILES
     ${MY_RESOURCES}
@@ -81,7 +83,7 @@ MACRO(CtkMacroBuildQtApp)
       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)
+  ENDIF()
   
   SET(my_libs
     ${CTK_BASE_LIBRARIES}

+ 8 - 6
CMake/ctkMacroBuildQtLib.cmake

@@ -1,7 +1,9 @@
 
 #
+# Depends on:
+#  CTK/CMake/ctkMacroParseArguments.cmake
 #
-#
+
 MACRO(CtkMacroBuildQtLib)
   ctkMacroParseArguments(MY
     "NAME;EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;RESOURCES;LIBRARY_TYPE"
@@ -12,13 +14,13 @@ MACRO(CtkMacroBuildQtLib)
   # Sanity checks
   IF(NOT DEFINED MY_NAME)
     MESSAGE(SEND_ERROR "NAME is mandatory")
-  ENDIF(NOT DEFINED MY_NAME)
+  ENDIF()
   IF(NOT DEFINED MY_EXPORT_DIRECTIVE)
     MESSAGE(SEND_ERROR "EXPORT_DIRECTIVE is mandatory")
-  ENDIF(NOT DEFINED MY_EXPORT_DIRECTIVE)
+  ENDIF()
   IF(NOT DEFINED MY_LIBRARY_TYPE)
     SET(MY_LIBRARY_TYPE "SHARED")
-  ENDIF(NOT DEFINED MY_LIBRARY_TYPE)
+  ENDIF()
 
   # Define library name
   SET(lib_name ${MY_NAME})
@@ -50,7 +52,7 @@ MACRO(CtkMacroBuildQtLib)
   SET(MY_QRC_SRCS "")
   IF(DEFINED MY_RESOURCES)
     QT4_ADD_RESOURCES(MY_QRC_SRCS ${MY_RESOURCES})
-  ENDIF(DEFINED MY_RESOURCES)
+  ENDIF()
 
   SOURCE_GROUP("Resources" FILES
     ${MY_RESOURCES}
@@ -75,7 +77,7 @@ MACRO(CtkMacroBuildQtLib)
       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)
+  ENDIF()
   
   SET(my_libs
     ${MY_TARGET_LIBRARIES}

+ 8 - 6
CMake/ctkMacroBuildQtPlugin.cmake

@@ -1,7 +1,9 @@
 
 #
+# Depends on:
+#  CTK/CMake/ctkMacroParseArguments.cmake
 #
-#
+
 MACRO(ctkMacroBuildQtPlugin)
   CtkMacroParseArguments(MY
     "NAME;EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;UI_RESOURCES;QRC_FILES;LIBRARY_TYPE"
@@ -12,13 +14,13 @@ MACRO(ctkMacroBuildQtPlugin)
   # Sanity checks
   IF(NOT DEFINED MY_NAME)
     MESSAGE(SEND_ERROR "NAME is mandatory")
-  ENDIF(NOT DEFINED MY_NAME)
+  ENDIF()
   IF(NOT DEFINED MY_EXPORT_DIRECTIVE)
     MESSAGE(SEND_ERROR "EXPORT_DIRECTIVE is mandatory")
-  ENDIF(NOT DEFINED MY_EXPORT_DIRECTIVE)
+  ENDIF()
   IF(NOT DEFINED MY_LIBRARY_TYPE)
     SET(MY_LIBRARY_TYPE "SHARED")
-  ENDIF(NOT DEFINED MY_LIBRARY_TYPE)
+  ENDIF()
 
   # Define library name
   SET(lib_name ${MY_NAME})
@@ -51,7 +53,7 @@ MACRO(ctkMacroBuildQtPlugin)
   SET(MY_QRC_SRCS "")
   IF(DEFINED MY_QRC_FILES)
     QT4_ADD_RESOURCES(MY_QRC_SRCS ${MY_QRC_FILES})
-  ENDIF(DEFINED MY_QRC_FILES)
+  ENDIF()
 
   SOURCE_GROUP("Resources" FILES
     ${MY_UI_RESOURCES}
@@ -77,7 +79,7 @@ MACRO(ctkMacroBuildQtPlugin)
 #       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)
+#   ENDIF()
   
   SET(my_libs
     ${CTK_BASE_LIBRARIES}

+ 4 - 0
CMake/ctkMacroGetTargetLibraries.cmake

@@ -1,4 +1,8 @@
 
+#
+#
+#
+
 MACRO(ctkMacroGetTargetLibraries varname)
 
   SET(target_libraries_path ${CMAKE_CURRENT_SOURCE_DIR}/target_libraries.cmake)

+ 2 - 4
CMake/ctkMacroSetupQt.cmake

@@ -1,9 +1,7 @@
+
+#
 #
-#  Check if VTK was configured with QT, 
-#  if so, use it, 
-#  otherwise, complain. 
 #
-
 
 MACRO(ctkMacroSetupQt)