Fix XCode 12 build. Remove support for XCode < 11.

skui-org · Sep 1, 2020 · 93b8012 · 93b8012
1 parent 73a2b1e
commit 93b8012
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -238,23 +238,19 @@ jobs:
         - GENERATOR=Ninja
         - C_COMPILER=clang
         - CXX_COMPILER=clang++
-        - CI_CXX_FLAGS='-D_LIBCPP_DISABLE_AVAILABILITY -Wno-unused-command-line-argument -nostdinc++ -isystem /Users/travis/libc++/include/c++/v1'
-        - CI_LDFLAGS='-L /Users/travis/libc++/lib'
+        - MACOSX_DEPLOYMENT_TARGET=10.15
         - CONFIGURATION=Release
       before_install:
         - . ./ci/setup_cmake.sh 3.16.4 Darwin
         - . ./ci/setup_ninja.sh 1.8.2 mac
-        - . ./ci/setup_libcxx.sh 8.0.1 /Users/travis/libc++
     - os: osx
       osx_image: xcode12
       env:
         - GENERATOR=Ninja
         - C_COMPILER=clang
         - CXX_COMPILER=clang++
-        - CI_CXX_FLAGS='-D_LIBCPP_DISABLE_AVAILABILITY -Wno-unused-command-line-argument -nostdinc++ -isystem /Users/travis/libc++/include/c++/v1'
-        - CI_LDFLAGS='-L /Users/travis/libc++/lib'
+        - MACOSX_DEPLOYMENT_TARGET=10.15
         - CONFIGURATION=Release
       before_install:
         - . ./ci/setup_cmake.sh 3.16.4 Darwin
         - . ./ci/setup_ninja.sh 1.8.2 mac
-        - . ./ci/setup_libcxx.sh 10.0.1 /Users/travis/libc++
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -83,5 +83,4 @@ target_link_libraries(core PUBLIC $<$<PLATFORM_ID:Linux>:-pthread>
                                   $<$<AND:$<PLATFORM_ID:Windows>,$<AND:$<CXX_COMPILER_ID:Clang>,$<NOT:$<STREQUAL:"x${CMAKE_CXX_SIMULATE_ID}","xMSVC">>>>:-lstdc++fs>
                                   $<$<AND:$<NOT:$<PLATFORM_ID:Windows>>,$<AND:$<CXX_COMPILER_ID:Clang>,$<AND:$<VERSION_GREATER_EQUAL:$<CXX_COMPILER_VERSION>,7>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,9>>>>:-lc++fs>
                                   $<$<AND:$<NOT:$<PLATFORM_ID:Windows>>,$<AND:$<CXX_COMPILER_ID:Clang>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,7>>>:-lc++experimental>
-                                  $<$<AND:$<PLATFORM_ID:Darwin>,$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>>:-lc++fs>
                                   $<$<NOT:$<PLATFORM_ID:Windows>>:-ldl>)