From c2123e0b1d29f5a0d9efe897945203eabed93e69 Mon Sep 17 00:00:00 2001 From: jcschaff Date: Fri, 26 Jul 2024 13:24:16 -0400 Subject: [PATCH] remove explicit dependency on libc++ for stdlib --- .github/workflows/cd.yml | 1 - CMakeLists.txt | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 6fe7ab21..411048ca 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -203,7 +203,6 @@ jobs: mingw-w64-clang-x86_64-netcdf mingw-w64-clang-x86_64-zlib mingw-w64-clang-x86_64-libaec - mingw-w64-clang-x86_64-libc++ # - name: Setup tmate session # uses: mxschmitt/action-tmate@v3 diff --git a/CMakeLists.txt b/CMakeLists.txt index 22c78cfb..8b1ebe03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,7 +127,9 @@ if (${OPTION_TARGET_DOCS}) endif() if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") +# if (NOT WINDOWS) +# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") +# endif() set(CMAKE_OSX_DEPLOYMENT_TARGET "10.7" CACHE STRING "Choose minimum deploy target for Macos machines") endif()