Przeglądaj źródła

Cleanup of message commands and indentation.

Sascha Zelzer 14 lat temu
rodzic
commit
e31125c8ab

+ 0 - 4
CMake/ctkMacroBuildLib.cmake

@@ -54,8 +54,6 @@ MACRO(ctkMacroBuildLib)
     ${MY_INCLUDE_DIRECTORIES}
     )  
 
-  MESSAGE("setting up include dirs for ${lib_name}")
-
   # Add the include directories from the library dependencies
   # The variable ${lib_name}_DEPENDENCIES is set in the
   # macro ctkMacroValidateBuildOptions
@@ -71,9 +69,7 @@ MACRO(ctkMacroBuildLib)
          )
   ENDFOREACH()
 
-MESSAGE("[${lib_name}] ext deps: ${ext_deps}")
   FOREACH(dep ${ext_deps})
-MESSAGE("[${lib_name}] ${dep}_INCLUDE_DIRS: ${${dep}_INCLUDE_DIRS}")
     STRING(REPLACE "^" ";" _include_dirs "${${dep}_INCLUDE_DIRS}")
     LIST(APPEND my_includes ${_include_dirs})
   ENDFOREACH()

+ 0 - 2
CMake/ctkMacroBuildPlugin.cmake

@@ -104,7 +104,6 @@ MACRO(ctkMacroBuildPlugin)
   ctkMacroGetAllNonCTKTargetLibraries("${${lib_name}_DEPENDENCIES}" ext_deps)
 
   FOREACH(dep ${ctk_deps})
-    MESSAGE("Adding ctk include path for ${dep}")
     LIST(APPEND my_includes
          ${${dep}_SOURCE_DIR}
          ${${dep}_BINARY_DIR}
@@ -112,7 +111,6 @@ MACRO(ctkMacroBuildPlugin)
   ENDFOREACH()
 
   FOREACH(dep ${ext_deps})
-MESSAGE("Adding ext include path for ${dep}: ${${dep}_INCLUDE_DIRS}")
     STRING(REPLACE "^" ";" _include_dirs "${${dep}_INCLUDE_DIRS}")
     LIST(APPEND my_includes ${_include_dirs})
   ENDFOREACH()

+ 9 - 16
CMakeLists.txt

@@ -502,35 +502,28 @@ ENDIF()
 # This relies on the variable EXTERNAL_TARGETS set in ctkMacroValidateBuildOptions
 FOREACH(_external_target ${EXTERNAL_TARGETS})
   IF(${_external_target}_FIND_PACKAGE_CMD)
-MESSAGE("Calling FIND_PACKAGE(${${_external_target}_FIND_PACKAGE_CMD})")
+    #MESSAGE("Calling FIND_PACKAGE(${${_external_target}_FIND_PACKAGE_CMD})")
     FIND_PACKAGE(${${_external_target}_FIND_PACKAGE_CMD})
   ENDIF()
 ENDFOREACH()
 
 FOREACH(_external_target ${EXTERNAL_TARGETS})
   IF(${_external_target}_INCLUDE_DIRS)
-  STRING(REPLACE "^" ";" _include_variable_list "${${_external_target}_INCLUDE_DIRS}")
-  IF(_include_variable_list)
-MESSAGE("[${_external_target}] Resolving include variables: ${${_external_target}_INCLUDE_DIRS}")
-    #LIST(LENGTH _include_variable_list _list_length)
-    SET(${_external_target}_INCLUDE_DIRS "")
-    #IF(_list_length GREATER 1)
+    STRING(REPLACE "^" ";" _include_variable_list "${${_external_target}_INCLUDE_DIRS}")
+    IF(_include_variable_list)
+      #MESSAGE("[${_external_target}] Resolving include variables: ${${_external_target}_INCLUDE_DIRS}")
+      SET(${_external_target}_INCLUDE_DIRS "")
       FOREACH(_include_variable ${_include_variable_list})
-        #SET(${_external_target}_INCLUDE_DIRS
-        #    "${${_external_target}_INCLUDE_DIRS}^${${_include_variable}}")
-MESSAGE("[${_external_target}] Appending ${${_include_variable}}")
+        #MESSAGE("[${_external_target}] Appending ${${_include_variable}}")
         IF(${_include_variable})
           LIST(APPEND ${_external_target}_INCLUDE_DIRS ${${_include_variable}})
         ELSE()
           LIST(APPEND ${_external_target}_INCLUDE_DIRS ${_include_variable})
         ENDIF()
-MESSAGE("[${_external_target}] New dirs: ${${_external_target}_INCLUDE_DIRS}")
+        #MESSAGE("[${_external_target}] New dirs: ${${_external_target}_INCLUDE_DIRS}")
       ENDFOREACH()
-MESSAGE("[${_external_target}] Appended dirs: ${${_external_target}_INCLUDE_DIRS}")
-    #ELSE()
-    #  SET(${_external_target}_INCLUDE_DIRS ${_include_variable_list})
-    #ENDIF()
-  ENDIF()
+      #MESSAGE("[${_external_target}] Appended dirs: ${${_external_target}_INCLUDE_DIRS}")
+    ENDIF()
   ENDIF()
 ENDFOREACH()
 

+ 1 - 1
SuperBuild.cmake

@@ -144,7 +144,7 @@ FOREACH(p ${external_projects})
   ENDIF()
 ENDFOREACH()
 
-MESSAGE("Superbuild args: ${dependency_args}")
+#MESSAGE("Superbuild args: ${dependency_args}")
    
 #-----------------------------------------------------------------------------
 # CTK Utilities