Merge pull request #1277 from performous/fix-clang-detection

Thirdparty benchmark: Fix Clang detection.
This commit is contained in:
Niels Lohmann 2018-10-06 16:29:26 +02:00 committed by GitHub
commit ac38e95780
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View file

@ -140,7 +140,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()
@ -165,7 +165,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")

View file

@ -7,7 +7,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++")