github-repos/benchmark
1
0
Fork 0
mirror of https://github.com/google/benchmark.git synced 2025-01-13 21:30:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ensure all informational cmake messages have STATUS type

Browse Source
This commit is contained in:
Dominic Hamon 2018-11-13 09:56:22 +00:00
parent a9b31c51b1
commit bb15a4e3bf
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -79,7 +79,7 @@ get_git_version(GIT_VERSION)
# Tell the user what versions we are using # Tell the user what versions we are using
string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" VERSION ${GIT_VERSION}) string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" VERSION ${GIT_VERSION})
message("-- Version: ${VERSION}") message(STATUS "Version: ${VERSION}")
# The version of the libraries # The version of the libraries
set(GENERIC_LIB_VERSION ${VERSION}) set(GENERIC_LIB_VERSION ${VERSION})
@ -224,7 +224,7 @@ if (BENCHMARK_USE_LIBCXX)
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR
"${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
add_cxx_compiler_flag(-nostdinc++) 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 # Adding -nodefaultlibs directly to CMAKE_<TYPE>_LINKER_FLAGS will break
# configuration checks such as 'find_package(Threads)' # configuration checks such as 'find_package(Threads)'
list(APPEND BENCHMARK_CXX_LINKER_FLAGS -nodefaultlibs) list(APPEND BENCHMARK_CXX_LINKER_FLAGS -nodefaultlibs)

10
cmake/CXXFeatureCheck.cmake
View File

@ -28,7 +28,7 @@ function(cxx_feature_check FILE)
endif() endif()
if (NOT DEFINED COMPILE_${FEATURE}) if (NOT DEFINED COMPILE_${FEATURE})
message("-- Performing Test ${FEATURE}") message(STATUS "Performing Test ${FEATURE}")
if(CMAKE_CROSSCOMPILING) if(CMAKE_CROSSCOMPILING)
try_compile(COMPILE_${FEATURE} try_compile(COMPILE_${FEATURE}
${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${FILE}.cpp ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${FILE}.cpp
@ -42,7 +42,7 @@ function(cxx_feature_check FILE)
set(RUN_${FEATURE} 1) set(RUN_${FEATURE} 1)
endif() endif()
else() else()
message("-- Performing Test ${FEATURE}") message(STATUS "Performing Test ${FEATURE}")
try_run(RUN_${FEATURE} COMPILE_${FEATURE} try_run(RUN_${FEATURE} COMPILE_${FEATURE}
${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${FILE}.cpp ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${FILE}.cpp
CMAKE_FLAGS ${BENCHMARK_CXX_LINKER_FLAGS} CMAKE_FLAGS ${BENCHMARK_CXX_LINKER_FLAGS}
@ -51,14 +51,14 @@ function(cxx_feature_check FILE)
endif() endif()
if(RUN_${FEATURE} EQUAL 0) if(RUN_${FEATURE} EQUAL 0)
message("-- Performing Test ${FEATURE} -- success") message(STATUS "Performing Test ${FEATURE} -- success")
set(HAVE_${VAR} 1 PARENT_SCOPE) set(HAVE_${VAR} 1 PARENT_SCOPE)
add_definitions(-DHAVE_${VAR}) add_definitions(-DHAVE_${VAR})
else() else()
if(NOT COMPILE_${FEATURE}) if(NOT COMPILE_${FEATURE})
message("-- Performing Test ${FEATURE} -- failed to compile") message(STATUS "Performing Test ${FEATURE} -- failed to compile")
else() else()
message("-- Performing Test ${FEATURE} -- compiled but failed to run") message(STATUS "Performing Test ${FEATURE} -- compiled but failed to run")
endif() endif()
endif() endif()
endfunction() endfunction()

2
cmake/GetGitVersion.cmake
View File

@ -49,6 +49,6 @@ function(get_git_version var)
set(GIT_VERSION "v0.0.0") set(GIT_VERSION "v0.0.0")
endif() endif()
message("-- git Version: ${GIT_VERSION}") message(STATUS "git Version: ${GIT_VERSION}")
set(${var} ${GIT_VERSION} PARENT_SCOPE) set(${var} ${GIT_VERSION} PARENT_SCOPE)
endfunction() endfunction()