diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f6924e77e..48f6d1029 100644 --- 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 index 9f0b33ded..9c84c0dc8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,12 +100,12 @@ target_compile_options(${PROJECT_NAME}_warnings $<$:-Wno-comma-subscript> $<$:-Wshadow=local> $<$:-Wno-attributes> - $<$:-Wno-deprecated-comma-subscript> - $<$:-Wno-unknown-warning-option> - $<$:-Wshadow> - $<$:-Wno-gcc-compat> - $<$:-Wno-c++20-extensions> - $<$:-Wno-c++20-compat> + $<$:-Wno-deprecated-comma-subscript> + $<$:-Wno-unknown-warning-option> + $<$:-Wshadow> + $<$:-Wno-gcc-compat> + $<$:-Wno-c++20-extensions> + $<$:-Wno-c++20-compat> $<$:-Wno-deprecated-comma-subscript> $<$:-Wno-unknown-warning-option> $<$:-Wshadow> diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 82a0b114c..23d97c321 100644 --- 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 "_*" )