From db3e74fa9c683f2fdd7f0244cedc0fbf3f9478f6 Mon Sep 17 00:00:00 2001 From: Joel Pelaez Jorge Date: Mon, 14 Oct 2019 18:04:05 -0500 Subject: Fix CMake checks for Apple Clang 11.0 on macOS 10.15 (#8580) * Fix CMake checks for Apple Clang 11.0 on macOS 10.15 * Use clang++ instance clang if allowAppleClang is enabled --- toolsrc/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'toolsrc') diff --git a/toolsrc/CMakeLists.txt b/toolsrc/CMakeLists.txt index 3ae7cdae5..bbecb8f30 100644 --- a/toolsrc/CMakeLists.txt +++ b/toolsrc/CMakeLists.txt @@ -23,7 +23,11 @@ endif() if(CMAKE_COMPILER_IS_GNUXX OR CMAKE_CXX_COMPILER_ID MATCHES "GNU") set(GCC 1) elseif(CMAKE_CXX_COMPILER_ID MATCHES "AppleClang") - if(NOT VCPKG_ALLOW_APPLE_CLANG) + if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "11.0.0") + set(CLANG 1) + # Disable linking with libc++fs because this features are added in libc++ library + set(NO_LIBCXXFS 1) + elseif(NOT VCPKG_ALLOW_APPLE_CLANG) message(FATAL_ERROR "Building the vcpkg tool requires support for the C++ Filesystem TS. Apple clang versions 10.01 and below do not have support for it. @@ -58,7 +62,7 @@ endif() if(GCC OR (CLANG AND USES_LIBSTDCXX)) link_libraries(stdc++fs) -elseif(CLANG AND NOT MSVC) +elseif(CLANG AND NOT MSVC AND NOT NO_LIBCXXFS) link_libraries(c++fs) endif() -- cgit v1.2.3