Merge remote-tracking branch 'app4triqs-remote/unstable' into unstable

TRIQS · Aug 21, 2023 · 1e34be8 · 1e34be8
2 parents 4127faf + 72029ee
commit 1e34be8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -64,6 +64,11 @@ jobs:
         pip3 install mako numpy scipy mpi4py
         pip3 install -r requirements.txt
 
+    - name: add clang cxxflags
+      if: ${{ contains(matrix.cxx, 'clang') }}
+      run:
+        echo "CXXFLAGS=-stdlib=libc++" >> $GITHUB_ENV
+
     - name: Build nda
       env:
         CC: ${{ matrix.cc }}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -100,12 +100,12 @@ target_compile_options(${PROJECT_NAME}_warnings
     $<$<CXX_COMPILER_ID:GNU>:-Wno-comma-subscript>
     $<$<CXX_COMPILER_ID:GNU>:-Wshadow=local>
     $<$<CXX_COMPILER_ID:GNU>:-Wno-attributes>
-    $<$<CXX_COMPILER_ID:Clang>:-Wno-deprecated-comma-subscript>
-    $<$<CXX_COMPILER_ID:Clang>:-Wno-unknown-warning-option>
-    $<$<CXX_COMPILER_ID:Clang>:-Wshadow>
-    $<$<CXX_COMPILER_ID:Clang>:-Wno-gcc-compat>
-    $<$<CXX_COMPILER_ID:Clang>:-Wno-c++20-extensions>
-    $<$<CXX_COMPILER_ID:Clang>:-Wno-c++20-compat>
+    $<$<CXX_COMPILER_ID:Clang,IntelLLVM>:-Wno-deprecated-comma-subscript>
+    $<$<CXX_COMPILER_ID:Clang,IntelLLVM>:-Wno-unknown-warning-option>
+    $<$<CXX_COMPILER_ID:Clang,IntelLLVM>:-Wshadow>
+    $<$<CXX_COMPILER_ID:Clang,IntelLLVM>:-Wno-gcc-compat>
+    $<$<CXX_COMPILER_ID:Clang,IntelLLVM>:-Wno-c++20-extensions>
+    $<$<CXX_COMPILER_ID:Clang,IntelLLVM>:-Wno-c++20-compat>
     $<$<CXX_COMPILER_ID:AppleClang>:-Wno-deprecated-comma-subscript>
     $<$<CXX_COMPILER_ID:AppleClang>:-Wno-unknown-warning-option>
     $<$<CXX_COMPILER_ID:AppleClang>:-Wshadow>

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -69,6 +69,6 @@ endif()
 # ---------------------------------
 install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ COMPONENT documentation DESTINATION share/doc/${PROJECT_NAME}
   FILES_MATCHING
-  REGEX "\\.(html|pdf|png|gif|jpg|svg|ico|js|xsl|css|py|txt|inv|bib|ttf|woff2|eot)$"
+  REGEX "\\.(html|pdf|png|gif|jpg|svg|ico|js|xsl|css|py|txt|inv|bib|ttf|woff2|eot|sh)$"
   PATTERN "_*"
 )