Skip to content

B
benchmark
Commit 9ffb8df6 by Gregorio Litenstein Committed by Dominic Hamon
Options

Fix Clang Detection (#697)

For several versions now, CMake by default refers to macOS’ Clang as AppleClang instead of just Clang, which would fail STREQUAL. Fixed by changing it to MATCHES.
parent a8082de5
Showing with 3 additions and 3 deletions
CMakeLists.txt
...@@ -193,7 +193,7 @@ else() ...@@ -193,7 +193,7 @@ else()
if (GCC_RANLIB) if (GCC_RANLIB)
set(CMAKE_RANLIB ${GCC_RANLIB}) set(CMAKE_RANLIB ${GCC_RANLIB})
endif() endif()
elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") elseif("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
include(llvm-toolchain) include(llvm-toolchain)
endif() endif()
endif() endif()
...@@ -218,7 +218,7 @@ else() ...@@ -218,7 +218,7 @@ else()
endif() endif()
if (BENCHMARK_USE_LIBCXX) if (BENCHMARK_USE_LIBCXX)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
add_cxx_compiler_flag(-stdlib=libc++) add_cxx_compiler_flag(-stdlib=libc++)
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")
......
cmake/HandleGTest.cmake
...@@ -5,7 +5,7 @@ macro(build_external_gtest) ...@@ -5,7 +5,7 @@ macro(build_external_gtest)
include(ExternalProject) include(ExternalProject)
set(GTEST_FLAGS "") set(GTEST_FLAGS "")
if (BENCHMARK_USE_LIBCXX) if (BENCHMARK_USE_LIBCXX)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
list(APPEND GTEST_FLAGS -stdlib=libc++) list(APPEND GTEST_FLAGS -stdlib=libc++)
else() else()
message(WARNING "Unsupported compiler (${CMAKE_CXX_COMPILER}) when using libc++") message(WARNING "Unsupported compiler (${CMAKE_CXX_COMPILER}) when using libc++")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment