mirror of
https://github.com/triqs/dft_tools
synced 2024-12-22 20:34:38 +01:00
Merge remote-tracking branch 'app4triqs-remote/unstable' into unstable
This commit is contained in:
commit
4521842a07
@ -2,3 +2,4 @@
|
|||||||
Dockerfile
|
Dockerfile
|
||||||
Jenkinsfile
|
Jenkinsfile
|
||||||
.git/objects/pack
|
.git/objects/pack
|
||||||
|
build*
|
||||||
|
5
.github/workflows/build.yml
vendored
5
.github/workflows/build.yml
vendored
@ -10,6 +10,7 @@ jobs:
|
|||||||
build:
|
build:
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- {os: ubuntu-20.04, cc: gcc-10, cxx: g++-10}
|
- {os: ubuntu-20.04, cc: gcc-10, cxx: g++-10}
|
||||||
@ -58,8 +59,8 @@ jobs:
|
|||||||
- name: Install homebrew dependencies
|
- name: Install homebrew dependencies
|
||||||
if: matrix.os == 'macos-10.15'
|
if: matrix.os == 'macos-10.15'
|
||||||
run: |
|
run: |
|
||||||
brew install gcc@10 llvm@10 boost fftw hdf5 open-mpi openblas numpy scipy mpi4py
|
brew install gcc@10 llvm boost fftw hdf5 open-mpi openblas
|
||||||
pip3 install mako
|
pip3 install mako numpy scipy mpi4py
|
||||||
pip3 install -r requirements.txt
|
pip3 install -r requirements.txt
|
||||||
|
|
||||||
- name: Build & Install TRIQS
|
- name: Build & Install TRIQS
|
||||||
|
@ -6,7 +6,10 @@ add_library(${PROJECT_NAME}::${PROJECT_NAME}_c ALIAS ${PROJECT_NAME}_c)
|
|||||||
target_link_libraries(${PROJECT_NAME}_c PUBLIC triqs PRIVATE $<BUILD_INTERFACE:${PROJECT_NAME}_warnings>)
|
target_link_libraries(${PROJECT_NAME}_c PUBLIC triqs PRIVATE $<BUILD_INTERFACE:${PROJECT_NAME}_warnings>)
|
||||||
|
|
||||||
# Configure target and compilation
|
# Configure target and compilation
|
||||||
set_property(TARGET ${PROJECT_NAME}_c PROPERTY POSITION_INDEPENDENT_CODE ON)
|
set_target_properties(${PROJECT_NAME}_c PROPERTIES
|
||||||
|
POSITION_INDEPENDENT_CODE ON
|
||||||
|
VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
|
||||||
|
)
|
||||||
target_include_directories(${PROJECT_NAME}_c PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/c++>)
|
target_include_directories(${PROJECT_NAME}_c PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/c++>)
|
||||||
target_include_directories(${PROJECT_NAME}_c SYSTEM INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include>)
|
target_include_directories(${PROJECT_NAME}_c SYSTEM INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include>)
|
||||||
target_compile_definitions(${PROJECT_NAME}_c PUBLIC
|
target_compile_definitions(${PROJECT_NAME}_c PUBLIC
|
||||||
|
Loading…
Reference in New Issue
Block a user