Use libc++ when using Clang

atmtools · Sep 15, 2022 · 4994387 · 4994387
1 parent 7137207
commit 4994387
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -151,7 +151,6 @@ jobs:
 
           if [ "${{ matrix.libcxx }}" = "yes" ]; then
             sudo apt-get install -y libc++-${{ matrix.version }}-dev libc++abi-${{ matrix.version }}-dev
-            echo "CXXFLAGS=-stdlib=libc++" >> $GITHUB_ENV
           fi
           sudo apt-get install -y python3-minimal python3-pip python3-setuptools zlib1g-dev libopenblas-dev libglew-dev libglfw3-dev
           sudo pip3 install docutils lark-parser matplotlib netCDF4 numpy pytest scipy xarray

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -293,7 +293,11 @@ endif (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
 ########### Special flags for certain compilers ##########
 if (CMAKE_COMPILER_IS_GNUCXX)
   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth-1024")
-endif (CMAKE_COMPILER_IS_GNUCXX)
+endif ()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES Clang)
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+endif ()
 
 ########### Warning flags ##########
 include (ArtsAddCompilerFlag)