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

TRIQS · Aug 21, 2023 · d466bd3 · d466bd3
2 parents bce67a4 + 7449192
commit d466bd3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -65,6 +65,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 itertools
       env:
         CC: ${{ matrix.cc }}

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 "_*"
 )