Переглянути джерело

Better verbose output for "*_{INCLUDE,LIBRARY}_DIRS" variables update

If possible associated the output with the name of the package.

For example "VTK" will be used instead of "VTK_LIBRARIES"
Jean-Christophe Fillion-Robin 12 роки тому
батько
коміт
85a03f557a
1 змінених файлів з 14 додано та 10 видалено
  1. 14 10
      CMakeLists.txt

+ 14 - 10
CMakeLists.txt

@@ -876,37 +876,41 @@ foreach(_external_target ${EXTERNAL_TARGETS})
 endforeach()
 
 foreach(_external_target ${EXTERNAL_TARGETS})
+  #set(_package_name ${${_external_target}_FIND_PACKAGE_CMD})
+  #if("${_package_name}" STREQUAL "")
+  #  set(_package_name ${_external_target})
+  #endif()
   if(${_external_target}_INCLUDE_DIRS)
-    #message("[${_external_target}] Resolving include variables: ${${_external_target}_INCLUDE_DIRS}")
+    #message("[${_package_name}] Resolving include variables: ${${_external_target}_INCLUDE_DIRS}")
     set(_updated_include_dirs)
     foreach(_include_variable ${${_external_target}_INCLUDE_DIRS})
       if(${_include_variable})
-        #message("[${_external_target}] Substituting [${_include_variable}] with [${${_include_variable}}]")
+        #message("[${_package_name}] Substituting [${_include_variable}] with [${${_include_variable}}]")
         list(APPEND _updated_include_dirs ${${_include_variable}})
       else()
-        #message("[${_external_target}] Appending ${${_include_variable}}")
+        #message("[${_package_name}] Appending ${${_include_variable}}")
         list(APPEND _updated_include_dirs ${_include_variable})
       endif()
-      #message("[${_external_target}] New dirs: ${_updated_include_dirs}")
+      #message("[${_package_name}] New dirs: ${_updated_include_dirs}")
     endforeach()
     set(${_external_target}_INCLUDE_DIRS ${_updated_include_dirs})
-    #message("[${_external_target}] Appended dirs: ${${_external_target}_INCLUDE_DIRS}")
+    #message("[${_package_name}] Appended dirs: ${${_external_target}_INCLUDE_DIRS}")
   endif()
   if(${_external_target}_LIBRARY_DIRS)
-    #message("[${_external_target}] Resolving library variables: ${${_external_target}_LIBRARY_DIRS}")
+    #message("[${_package_name}] Resolving library variables: ${${_external_target}_LIBRARY_DIRS}")
     set(_updated_library_dirs)
     foreach(_library_variable ${${_external_target}_LIBRARY_DIRS})
       if(${_library_variable})
-        #message("[${_external_target}] Substituting [${_library_variable}] with [${${_library_variable}}]")
+        #message("[${_package_name}] Substituting [${_library_variable}] with [${${_library_variable}}]")
         list(APPEND _updated_library_dirs ${${_library_variable}})
       else()
-        #message("[${_external_target}] Appending ${_library_variable}")
+        #message("[${_package_name}] Appending ${_library_variable}")
         list(APPEND _updated_library_dirs ${_library_variable})
       endif()
-      #message("[${_external_target}] New dirs: ${_updated_library_dirs}")
+      #message("[${_package_name}] New dirs: ${_updated_library_dirs}")
     endforeach()
     set(${_external_target}_LIBRARY_DIRS ${_updated_library_dirs})
-    #message("[${_external_target}] Appended dirs: ${${_external_target}_LIBRARY_DIRS}")
+    #message("[${_package_name}] Appended dirs: ${${_external_target}_LIBRARY_DIRS}")
   endif()
 endforeach()