Skip to content

Commit bb15a4e

Browse files
committed
Ensure all informational cmake messages have STATUS type
1 parent a9b31c5 commit bb15a4e

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ get_git_version(GIT_VERSION)
7979

8080
# Tell the user what versions we are using
8181
string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" VERSION ${GIT_VERSION})
82-
message("-- Version: ${VERSION}")
82+
message(STATUS "Version: ${VERSION}")
8383

8484
# The version of the libraries
8585
set(GENERIC_LIB_VERSION ${VERSION})
@@ -224,7 +224,7 @@ if (BENCHMARK_USE_LIBCXX)
224224
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR
225225
"${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
226226
add_cxx_compiler_flag(-nostdinc++)
227-
message("libc++ header path must be manually specified using CMAKE_CXX_FLAGS")
227+
message(WARNING "libc++ header path must be manually specified using CMAKE_CXX_FLAGS")
228228
# Adding -nodefaultlibs directly to CMAKE_<TYPE>_LINKER_FLAGS will break
229229
# configuration checks such as 'find_package(Threads)'
230230
list(APPEND BENCHMARK_CXX_LINKER_FLAGS -nodefaultlibs)

cmake/CXXFeatureCheck.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function(cxx_feature_check FILE)
2828
endif()
2929

3030
if (NOT DEFINED COMPILE_${FEATURE})
31-
message("-- Performing Test ${FEATURE}")
31+
message(STATUS "Performing Test ${FEATURE}")
3232
if(CMAKE_CROSSCOMPILING)
3333
try_compile(COMPILE_${FEATURE}
3434
${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${FILE}.cpp
@@ -42,7 +42,7 @@ function(cxx_feature_check FILE)
4242
set(RUN_${FEATURE} 1)
4343
endif()
4444
else()
45-
message("-- Performing Test ${FEATURE}")
45+
message(STATUS "Performing Test ${FEATURE}")
4646
try_run(RUN_${FEATURE} COMPILE_${FEATURE}
4747
${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${FILE}.cpp
4848
CMAKE_FLAGS ${BENCHMARK_CXX_LINKER_FLAGS}
@@ -51,14 +51,14 @@ function(cxx_feature_check FILE)
5151
endif()
5252

5353
if(RUN_${FEATURE} EQUAL 0)
54-
message("-- Performing Test ${FEATURE} -- success")
54+
message(STATUS "Performing Test ${FEATURE} -- success")
5555
set(HAVE_${VAR} 1 PARENT_SCOPE)
5656
add_definitions(-DHAVE_${VAR})
5757
else()
5858
if(NOT COMPILE_${FEATURE})
59-
message("-- Performing Test ${FEATURE} -- failed to compile")
59+
message(STATUS "Performing Test ${FEATURE} -- failed to compile")
6060
else()
61-
message("-- Performing Test ${FEATURE} -- compiled but failed to run")
61+
message(STATUS "Performing Test ${FEATURE} -- compiled but failed to run")
6262
endif()
6363
endif()
6464
endfunction()

cmake/GetGitVersion.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@ function(get_git_version var)
4949
set(GIT_VERSION "v0.0.0")
5050
endif()
5151

52-
message("-- git Version: ${GIT_VERSION}")
52+
message(STATUS "git Version: ${GIT_VERSION}")
5353
set(${var} ${GIT_VERSION} PARENT_SCOPE)
5454
endfunction()

0 commit comments

Comments
 (0)