Specify log level for CMake messages (less stderr)

[siedentop]

Summary

Specify message levels in CMake. Prefer STATUS (stdout).

As the default message mode (i.e. level) is NOTICE in CMake, more then necessary messages get printed to stderr. Some tools, noticably ccmake treat this as an error and require additional confirmation and re-running CMake's configuration step.

This commit specifies a mode (either STATUS or WARNING or FATAL_ERROR) instead of the default.

• I used csearch -f 'llvm-project/.+(CMakeLists\.txt|cmake)' -l 'message\("' to find all locations.
• Reviewers were chosen by the most common authors of specific files. If there are more suitable reviewers for these CMake changes, please let me know.

[xiaobai]

Seems alright to me. I'd like to see 1 message changed from a STATUS to a WARNING though.

lldb/cmake/modules/LLDBConfig.cmake

131

Please make this a warning.

[siedentop]

Modified STATUS to WARNING as requested by @xiaobai

[siedentop]

Thank you for the review, @xiaobai. I've made the requested change.

[lebedev.ri]

The llvm/utils/benchmark/ changes - can you please either submit them upstream yourself, or explicitly state that it is okay to steal them from you and submit?

[siedentop]

In D63370#1544767, @lebedev.ri wrote:

The llvm/utils/benchmark/ changes - can you please either submit them upstream yourself, or explicitly state that it is okay to steal them from you and submit?

Thanks, @lebedev.ri, I was not aware that llvm/utils/benchmark contains Google Benchmark.

I just checked: all three modified files in llvm/utils/benchmark/ already have the same modifications on upstream (HEAD == 090faecb454fb).

I propose that I remove my modifications from this review. I'll go ahead with this -- but please let me know if you disagree.

[lebedev.ri]

In D63370#1544970, @siedentop wrote:

In D63370#1544767, @lebedev.ri wrote:

The llvm/utils/benchmark/ changes - can you please either submit them upstream yourself, or explicitly state that it is okay to steal them from you and submit?

Thanks, @lebedev.ri, I was not aware that llvm/utils/benchmark contains Google Benchmark.

I just checked: all three modified files in llvm/utils/benchmark/ already have the same modifications on upstream (HEAD == 090faecb454fb).

Ah yes, apparently so, thanks for checking!
I have no further comments then.

I propose that I remove my modifications from this review. I'll go ahead with this -- but please let me know if you disagree.

[siedentop]

Removed changes to llvm/utils/benchmark.

[sgraenitz]

Thanks for the initiative! Three inline comments for cosmetics.

lldb/cmake/modules/LLDBConfig.cmake

143

STATUS messages are automatically prefixed with -- so it can be removed from the text here.

187

Same as above. Please remove -- .

lldb/cmake/modules/LLDBStandalone.cmake

98

Same as above. Please remove -- .

[siedentop]

@sgraenitz , good find. I've removed the leading dashes.

[siedentop]

@sgraenitz I cannot merge the changes myself, could you please commit them for me?

compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake

if(COMPILER_RT_SUPPORTED_ARCH MATCHES ".*armv.*")
     set(i386_FUNCTIONS ${common_FUNCTIONS} ${i386_FUNCTIONS})
     set(x86_64_FUNCTIONS ${common_FUNCTIONS})
 
     foreach(arch ${DARWIN_macho_embedded_ARCHS})
       filter_builtin_sources(${arch}_filtered_sources
         INCLUDE ${arch}_FUNCTIONS
         ${${arch}_SOURCES})
       if(NOT ${arch}_filtered_sources)
-        message("${arch}_SOURCES: ${${arch}_SOURCES}")
-        message("${arch}_FUNCTIONS: ${${arch}_FUNCTIONS}")
+        message(WARNING "${arch}_SOURCES: ${${arch}_SOURCES}")
+        message(WARNING "${arch}_FUNCTIONS: ${${arch}_FUNCTIONS}")
         message(FATAL_ERROR "Empty filtered sources!")
       endif()
     endforeach()
 
     foreach(float_type SOFT HARD)
       foreach(type PIC STATIC)
         string(TOLOWER "${float_type}_${type}" lib_suffix)
         foreach(arch ${DARWIN_${float_type}_FLOAT_ARCHS})

lldb/cmake/modules/LLDBConfig.cmake

 # 3) FindPythonLibs queries the registry to locate Python, and when looking for a
 #    64-bit version of Python, since cmake.exe is a 32-bit executable, it will see
 #    a 32-bit view of the registry.  As such, it is impossible for FindPythonLibs to
 #    locate 64-bit Python libraries.
 # This function is designed to address those limitations.  Currently it only partially
 # addresses them, but it can be improved and extended on an as-needed basis.
 function(find_python_libs_windows)
   if ("${PYTHON_HOME}" STREQUAL "")
-    message("LLDB embedded Python on Windows requires specifying a value for PYTHON_HOME.  Python support disabled.")
+    message(STATUS "LLDB embedded Python on Windows requires specifying a value for PYTHON_HOME.  Python support disabled.")
     set(LLDB_DISABLE_PYTHON 1 PARENT_SCOPE)
     return()
   endif()
 
   file(TO_CMAKE_PATH "${PYTHON_HOME}/Include" PYTHON_INCLUDE_DIR)
 
   if(EXISTS "${PYTHON_INCLUDE_DIR}/patchlevel.h")
     file(STRINGS "${PYTHON_INCLUDE_DIR}/patchlevel.h" python_version_str
          REGEX "^#define[ \t]+PY_VERSION[ \t]+\"[^\"]+\"")
     string(REGEX REPLACE "^#define[ \t]+PY_VERSION[ \t]+\"([^\"+]+)[+]?\".*" "\\1"
          PYTHONLIBS_VERSION_STRING "${python_version_str}")
-    message("-- Found Python version ${PYTHONLIBS_VERSION_STRING}")
+    message(STATUS "-- Found Python version ${PYTHONLIBS_VERSION_STRING}")
     string(REGEX REPLACE "([0-9]+)[.]([0-9]+)[.][0-9]+" "python\\1\\2" PYTHONLIBS_BASE_NAME "${PYTHONLIBS_VERSION_STRING}")
     unset(python_version_str)
   else()
-    message("Unable to find ${PYTHON_INCLUDE_DIR}/patchlevel.h, Python installation is corrupt.")
-    message("Python support will be disabled for this build.")
+    message(WARNING "Unable to find ${PYTHON_INCLUDE_DIR}/patchlevel.h, Python installation is corrupt.")
+    message(WARNING "Python support will be disabled for this build.")
     set(LLDB_DISABLE_PYTHON 1 PARENT_SCOPE)
     return()
   endif()
 
   file(TO_CMAKE_PATH "${PYTHON_HOME}" PYTHON_HOME)
   # TODO(compnerd) when CMake Policy `CMP0091` is set to NEW, we should use
   # if(CMAKE_MSVC_RUNTIME_LIBRARY MATCHES MultiThreadedDebug)
   if(CMAKE_BUILD_TYPE STREQUAL Debug)
     file(TO_CMAKE_PATH "${PYTHON_HOME}/python_d.exe" PYTHON_EXE)
     file(TO_CMAKE_PATH "${PYTHON_HOME}/libs/${PYTHONLIBS_BASE_NAME}_d.lib" PYTHON_LIB)
     file(TO_CMAKE_PATH "${PYTHON_HOME}/${PYTHONLIBS_BASE_NAME}_d.dll" PYTHON_DLL)
   else()
     file(TO_CMAKE_PATH "${PYTHON_HOME}/python.exe" PYTHON_EXE)
     file(TO_CMAKE_PATH "${PYTHON_HOME}/libs/${PYTHONLIBS_BASE_NAME}.lib" PYTHON_LIB)
     file(TO_CMAKE_PATH "${PYTHON_HOME}/${PYTHONLIBS_BASE_NAME}.dll" PYTHON_DLL)
   endif()
 
   foreach(component PYTHON_EXE;PYTHON_LIB;PYTHON_DLL)
     if(NOT EXISTS ${${component}})
-      message("unable to find ${component}")
+      message(WARNING "unable to find ${component}")
       unset(${component})
     endif()
   endforeach()
 
   if (NOT PYTHON_EXE OR NOT PYTHON_LIB OR NOT PYTHON_DLL)
-    message("Unable to find all Python components.  Python support will be disabled for this build.")
+    message(WARNING "Unable to find all Python components.  Python support will be disabled for this build.")
     set(LLDB_DISABLE_PYTHON 1 PARENT_SCOPE)
     return()
   endif()
 
   set (PYTHON_EXECUTABLE ${PYTHON_EXE} PARENT_SCOPE)
   set (PYTHON_LIBRARY ${PYTHON_LIB} PARENT_SCOPE)
   set (PYTHON_DLL ${PYTHON_DLL} PARENT_SCOPE)
   set (PYTHON_INCLUDE_DIR ${PYTHON_INCLUDE_DIR} PARENT_SCOPE)
 
-  message("-- LLDB Found PythonExecutable: ${PYTHON_EXE}")
-  message("-- LLDB Found PythonLibs: ${PYTHON_LIB}")
-  message("-- LLDB Found PythonDLL: ${PYTHON_DLL}")
-  message("-- LLDB Found PythonIncludeDirs: ${PYTHON_INCLUDE_DIR}")
+  message(STATUS "-- LLDB Found PythonExecutable: ${PYTHON_EXE}")
+  message(STATUS "-- LLDB Found PythonLibs: ${PYTHON_LIB}")
+  message(STATUS "-- LLDB Found PythonDLL: ${PYTHON_DLL}")
+  message(STATUS "-- LLDB Found PythonIncludeDirs: ${PYTHON_INCLUDE_DIR}")
 endfunction(find_python_libs_windows)
 
 if (NOT LLDB_DISABLE_PYTHON)
 
   if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
     find_python_libs_windows()
 
     if (NOT LLDB_RELOCATABLE_PYTHON)

lldb/cmake/modules/LLDBStandalone.cmake

if (PYTHON_EXECUTABLE STREQUAL "")
     set(Python_ADDITIONAL_VERSIONS 3.5 3.4 3.3 3.2 3.1 3.0 2.7 2.6 2.5)
     include(FindPythonInterp)
     if( NOT PYTHONINTERP_FOUND )
       message(FATAL_ERROR
               "Unable to find Python interpreter, required for builds and testing.
                Please install Python or specify the PYTHON_EXECUTABLE CMake variable.")
     endif()
   else()
-    message("-- Found PythonInterp: ${PYTHON_EXECUTABLE}")
+    message(STATUS "-- Found PythonInterp: ${PYTHON_EXECUTABLE}")
   endif()
 
   set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
   set(LLVM_INCLUDE_TESTS ON CACHE INTERNAL "")
 
   option(LLVM_USE_FOLDERS "Enable solution folders in Visual Studio. Disable for Express versions." ON)
   if(LLVM_USE_FOLDERS)
     set_property(GLOBAL PROPERTY USE_FOLDERS ON)

llvm/cmake/modules/LLVMInstallSymlink.cmake

 # We need to execute this script at installation time because the
 # DESTDIR environment variable may be unset at configuration time.
 # See PR8397.
 
 function(install_symlink name target outdir)
   if(CMAKE_HOST_UNIX)
     set(LINK_OR_COPY create_symlink)
     set(DESTDIR $ENV{DESTDIR})
   else()
     set(LINK_OR_COPY copy)
   endif()
 
   set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}/")
 
-  message("Creating ${name}")
+  message(STATUS "Creating ${name}")
 
   execute_process(
     COMMAND "${CMAKE_COMMAND}" -E ${LINK_OR_COPY} "${target}" "${name}"
     WORKING_DIRECTORY "${bindir}")
 
 endfunction()

llvm/utils/benchmark/CMakeLists.txt

 
 
 # Read the git tags to determine the project version
 include(GetGitVersion)
 get_git_version(GIT_VERSION)
 
 # Tell the user what versions we are using
 string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" VERSION ${GIT_VERSION})
-message("-- Version: ${VERSION}")
+message(STATUS "-- Version: ${VERSION}")
 
 # The version of the libraries
 set(GENERIC_LIB_VERSION ${VERSION})
 string(SUBSTRING ${VERSION} 0 1 GENERIC_LIB_SOVERSION)
 
 # Import our CMake modules
 include(CheckCXXCompilerFlag)
 include(AddCXXCompilerFlag)

 endif()
 
 if (BENCHMARK_USE_LIBCXX)
   if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     add_cxx_compiler_flag(-stdlib=libc++)
   elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR
           "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
     add_cxx_compiler_flag(-nostdinc++)
-    message("libc++ header path must be manually specified using CMAKE_CXX_FLAGS")
+    message(WARNING "libc++ header path must be manually specified using CMAKE_CXX_FLAGS")
     # Adding -nodefaultlibs directly to CMAKE_<TYPE>_LINKER_FLAGS will break
     # configuration checks such as 'find_package(Threads)'
     list(APPEND BENCHMARK_CXX_LINKER_FLAGS -nodefaultlibs)
     # -lc++ cannot be added directly to CMAKE_<TYPE>_LINKER_FLAGS because
     # linker flags appear before all linker inputs and -lc++ must appear after.
     list(APPEND BENCHMARK_CXX_LIBRARIES c++)
   else()
     message(FATAL_ERROR "-DBENCHMARK_USE_LIBCXX:BOOL=ON is not supported for compiler")

llvm/utils/benchmark/cmake/CXXFeatureCheck.cmake

function(cxx_feature_check FILE)
   string(TOUPPER "HAVE_${VAR}" FEATURE)
   if (DEFINED HAVE_${VAR})
     set(HAVE_${VAR} 1 PARENT_SCOPE)
     add_definitions(-DHAVE_${VAR})
     return()
   endif()
 
   if (NOT DEFINED COMPILE_${FEATURE})
-    message("-- Performing Test ${FEATURE}")
+    message(STATUS "-- Performing Test ${FEATURE}")
     if(CMAKE_CROSSCOMPILING)
       try_compile(COMPILE_${FEATURE}
               ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${FILE}.cpp
               CMAKE_FLAGS ${BENCHMARK_CXX_LINKER_FLAGS}
               LINK_LIBRARIES ${BENCHMARK_CXX_LIBRARIES})
       if(COMPILE_${FEATURE})
         message(WARNING
               "If you see build failures due to cross compilation, try setting HAVE_${VAR} to 0")
         set(RUN_${FEATURE} 0)
       else()
         set(RUN_${FEATURE} 1)
       endif()
     else()
-      message("-- Performing Test ${FEATURE}")
+      message(STATUS "-- Performing Test ${FEATURE}")
       try_run(RUN_${FEATURE} COMPILE_${FEATURE}
               ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${FILE}.cpp
               CMAKE_FLAGS ${BENCHMARK_CXX_LINKER_FLAGS}
               LINK_LIBRARIES ${BENCHMARK_CXX_LIBRARIES})
     endif()
   endif()
 
   if(RUN_${FEATURE} EQUAL 0)
-    message("-- Performing Test ${FEATURE} -- success")
+    message(STATUS "-- Performing Test ${FEATURE} -- success")
     set(HAVE_${VAR} 1 PARENT_SCOPE)
     add_definitions(-DHAVE_${VAR})
   else()
     if(NOT COMPILE_${FEATURE})
-      message("-- Performing Test ${FEATURE} -- failed to compile")
+      message(WARNING "-- Performing Test ${FEATURE} -- failed to compile")
     else()
-      message("-- Performing Test ${FEATURE} -- compiled but failed to run")
+      message(STATUS "-- Performing Test ${FEATURE} -- compiled but failed to run")
     endif()
   endif()
 endfunction()

llvm/utils/benchmark/cmake/GetGitVersion.cmake

if(GIT_EXECUTABLE)
       string(COMPARE NOTEQUAL "${GIT_DIFF_INDEX}" "" GIT_DIRTY)
       if (${GIT_DIRTY})
           set(GIT_VERSION "${GIT_VERSION}-dirty")
       endif()
   else()
       set(GIT_VERSION "v0.0.0")
   endif()
 
-  message("-- git Version: ${GIT_VERSION}")
+  message(STATUS "-- git Version: ${GIT_VERSION}")
   set(${var} ${GIT_VERSION} PARENT_SCOPE)
 endfunction()