mirror of
https://github.com/triqs/dft_tools
synced 2024-09-12 05:38:31 +02:00
Merge branch '3.0.x' into unstable
This commit is contained in:
commit
b849c4383d
6
Jenkinsfile
vendored
6
Jenkinsfile
vendored
@ -53,8 +53,8 @@ for (int i = 0; i < dockerPlatforms.size(); i++) {
|
||||
|
||||
/****************** osx builds (on host) */
|
||||
def osxPlatforms = [
|
||||
["gcc", ['CC=gcc-9', 'CXX=g++-9', 'FC=gfortran-9']],
|
||||
["clang", ['CC=$BREW/opt/llvm/bin/clang', 'CXX=$BREW/opt/llvm/bin/clang++', 'FC=gfortran-9', 'CXXFLAGS=-I$BREW/opt/llvm/include', 'LDFLAGS=-L$BREW/opt/llvm/lib']]
|
||||
["gcc", ['CC=gcc-10', 'CXX=g++-10', 'FC=gfortran-10']],
|
||||
["clang", ['CC=$BREW/opt/llvm/bin/clang', 'CXX=$BREW/opt/llvm/bin/clang++', 'FC=gfortran-10', 'CXXFLAGS=-I$BREW/opt/llvm/include', 'LDFLAGS=-L$BREW/opt/llvm/lib']]
|
||||
]
|
||||
for (int i = 0; i < osxPlatforms.size(); i++) {
|
||||
def platformEnv = osxPlatforms[i]
|
||||
@ -82,7 +82,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
|
||||
"CPLUS_INCLUDE_PATH=$venv/include:$hdf5/include:${env.BREW}/include",
|
||||
"LIBRARY_PATH=$venv/lib:$hdf5/lib:${env.BREW}/lib",
|
||||
"LD_LIBRARY_PATH=$hdf5/lib",
|
||||
"PYTHONPATH=$installDir/lib/python3.7/site-packages",
|
||||
"PYTHONPATH=$installDir/lib/python3.8/site-packages",
|
||||
"CMAKE_PREFIX_PATH=$venv/lib/cmake/triqs"]) {
|
||||
deleteDir()
|
||||
/* note: this is installing into the parent (triqs) venv (install dir), which is thus shared among apps and so not be completely safe */
|
||||
|
Loading…
Reference in New Issue
Block a user