github-repos/benchmark
1
0
Fork 0
mirror of https://github.com/google/benchmark.git synced 2024-12-27 13:00:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

There is no "FATAL" in message(), only "FATAL_ERROR" (#584)

Browse Source
This commit is contained in:
Roman Lebedev 2018-05-08 13:33:37 +03:00 committed by Dominic Hamon
parent 16af64500f
commit e8ddd907bb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -216,7 +216,7 @@ if (BENCHMARK_USE_LIBCXX)
# linker flags appear before all linker inputs and -lc++ must appear after. # linker flags appear before all linker inputs and -lc++ must appear after.
list(APPEND BENCHMARK_CXX_LIBRARIES c++) list(APPEND BENCHMARK_CXX_LIBRARIES c++)
else() else()
message(FATAL "-DBENCHMARK_USE_LIBCXX:BOOL=ON is not supported for compiler") message(FATAL_ERROR "-DBENCHMARK_USE_LIBCXX:BOOL=ON is not supported for compiler")
endif() endif()
endif(BENCHMARK_USE_LIBCXX) endif(BENCHMARK_USE_LIBCXX)

4
cmake/HandleGTest.cmake
View File

@ -94,7 +94,7 @@ if (BENCHMARK_ENABLE_GTEST_TESTS)
HINTS ${HPATH} HINTS ${HPATH}
) )
if (NOT HEADER_PATH_${HEADER}) if (NOT HEADER_PATH_${HEADER})
message(FATAL "Failed to find header ${HFILE} in ${HPATH}") message(FATAL_ERROR "Failed to find header ${HFILE} in ${HPATH}")
endif() endif()
list(APPEND GTEST_INCLUDE_DIRS ${HEADER_PATH_${HEADER}}) list(APPEND GTEST_INCLUDE_DIRS ${HEADER_PATH_${HEADER}})
endforeach() endforeach()
@ -105,7 +105,7 @@ if (BENCHMARK_ENABLE_GTEST_TESTS)
find_path(GMOCK_INCLUDE_DIRS gmock/gmock.h find_path(GMOCK_INCLUDE_DIRS gmock/gmock.h
HINTS ${GTEST_INCLUDE_DIRS}) HINTS ${GTEST_INCLUDE_DIRS})
if (NOT GMOCK_INCLUDE_DIRS) if (NOT GMOCK_INCLUDE_DIRS)
message(FATAL "Failed to find header gmock/gmock.h with hint ${GTEST_INCLUDE_DIRS}") message(FATAL_ERROR "Failed to find header gmock/gmock.h with hint ${GTEST_INCLUDE_DIRS}")
endif() endif()
set(GTEST_INCLUDE_DIRS ${GTEST_INCLUDE_DIRS} ${GMOCK_INCLUDE_DIRS}) set(GTEST_INCLUDE_DIRS ${GTEST_INCLUDE_DIRS} ${GMOCK_INCLUDE_DIRS})
# FIXME: We don't currently require the gmock library to build the tests, # FIXME: We don't currently require the gmock library to build the tests,