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

This commit is contained in:
Nils Wentzell 2022-11-18 15:34:08 -05:00
commit e324b5728c
2 changed files with 5 additions and 3 deletions

View File

@ -15,8 +15,8 @@ jobs:
include:
- {os: ubuntu-20.04, cc: gcc-10, cxx: g++-10}
- {os: ubuntu-20.04, cc: clang-13, cxx: clang++-13}
- {os: macos-11, cc: gcc-11, cxx: g++-11}
- {os: macos-11, cc: /usr/local/opt/llvm/bin/clang, cxx: /usr/local/opt/llvm/bin/clang++}
- {os: macos-12, cc: gcc-11, cxx: g++-11}
- {os: macos-12, cc: /usr/local/opt/llvm/bin/clang, cxx: /usr/local/opt/llvm/bin/clang++}
runs-on: ${{ matrix.os }}
@ -61,7 +61,7 @@ jobs:
python3-nbsphinx
- name: Install homebrew dependencies
if: matrix.os == 'macos-11'
if: matrix.os == 'macos-12'
run: |
brew install gcc@11 llvm boost fftw hdf5 open-mpi openblas
pip3 install mako numpy scipy mpi4py

View File

@ -2,7 +2,9 @@
export @PROJECT_NAME@_ROOT=@CMAKE_INSTALL_PREFIX@
export CPLUS_INCLUDE_PATH=@CMAKE_INSTALL_PREFIX@/include:$CPLUS_INCLUDE_PATH
export PATH=@CMAKE_INSTALL_PREFIX@/bin:$PATH
export LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/lib:$LIBRARY_PATH
export LD_LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/lib:$LD_LIBRARY_PATH
export CMAKE_PREFIX_PATH=@CMAKE_INSTALL_PREFIX@:$CMAKE_PREFIX_PATH
@EXPORT_PYTHON_PATH@