From b496f7df493085d4e9b83082f33258bc164dcece Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 28 Nov 2017 13:06:56 -0800 Subject: [vcpkg] Further fix for clang/gcc --- toolsrc/CMakeLists.txt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/toolsrc/CMakeLists.txt b/toolsrc/CMakeLists.txt index 0325160ee..51578e4e4 100644 --- a/toolsrc/CMakeLists.txt +++ b/toolsrc/CMakeLists.txt @@ -1,18 +1,24 @@ cmake_minimum_required(VERSION 3.3) project(vcpkg CXX) +add_compile_options(-std=c++1z) + +if(CMAKE_COMPILER_IS_GNUXX) + set(GCC 1) +elseif(CMAKE_CXX_COMPILER_ID MATCHES "[Cc]lang") + set(CLANG 1) +endif() + file(GLOB_RECURSE VCPKGLIB_SOURCES src/vcpkg/*.cpp) add_library(vcpkglib STATIC ${VCPKGLIB_SOURCES}) target_compile_definitions(vcpkglib PRIVATE -DDISABLE_METRICS=0) target_include_directories(vcpkglib PUBLIC include) -if(CMAKE_COMPILER_IS_GNUXX) - target_link_libraries(vcpkglib PRIVATE stdc++fs) - target_compile_options(vcpkglib PRIVATE -std=c++1z) -elseif(CMAKE_CXX_COMPILER_ID MATCHES "[Cc]lang") - target_link_libraries(vcpkglib PRIVATE c++experimental) - target_compile_options(vcpkglib PRIVATE -std=c++1z) +if(GCC) + target_link_libraries(vcpkglib PUBLIC stdc++fs) +elseif(CLANG) + target_link_libraries(vcpkglib PUBLIC c++experimental) endif() add_executable(vcpkg src/vcpkg.cpp) -- cgit v1.2.3