LCPQ/dft_tools
3
0
Fork 0
mirror of https://github.com/triqs/dft_tools synced 2024-12-31 00:25:51 +01:00
Code Issues Releases Wiki Activity

[jenkins] Support brew installed in other places

Browse Source
This commit is contained in:
Dylan Simon 2018-06-08 12:10:58 -04:00
parent 006702252c
commit 6d55aa7070
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Jenkinsfile vendored
View File

@ -42,7 +42,7 @@ for (int i = 0; i < dockerPlatforms.size(); i++) {
def osxPlatforms = [ def osxPlatforms = [
["gcc", ['CC=gcc-7', 'CXX=g++-7']], ["gcc", ['CC=gcc-7', 'CXX=g++-7']],
["clang", ['CC=/usr/local/opt/llvm/bin/clang', 'CXX=/usr/local/opt/llvm/bin/clang++', 'CXXFLAGS=-I/usr/local/opt/llvm/include', 'LDFLAGS=-L/usr/local/opt/llvm/lib']] ["clang", ['CC=$BREW/opt/llvm/bin/clang', 'CXX=$BREW/opt/llvm/bin/clang++', 'CXXFLAGS=-I$BREW/opt/llvm/include', 'LDFLAGS=-L$BREW/opt/llvm/lib']]
] ]
for (int i = 0; i < osxPlatforms.size(); i++) { for (int i = 0; i < osxPlatforms.size(); i++) {
def platformEnv = osxPlatforms[i] def platformEnv = osxPlatforms[i]
@ -59,10 +59,10 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
} }
checkout scm checkout scm
dir(buildDir) { withEnv(platformEnv[1]+[ dir(buildDir) { withEnv(platformEnv[1].collect { it.replace('\$BREW', env.BREW) } + [
"PATH=$triqsDir/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin", "PATH=$triqsDir/bin:${env.BREW}/bin:/usr/bin:/bin:/usr/sbin",
"CPATH=$triqsDir/include", "CPATH=$triqsDir/include:${env.BREW}/include",
"LIBRARY_PATH=$triqsDir/lib", "LIBRARY_PATH=$triqsDir/lib:${env.BREW}/lib",
"CMAKE_PREFIX_PATH=$triqsDir/share/cmake"]) { "CMAKE_PREFIX_PATH=$triqsDir/share/cmake"]) {
deleteDir() deleteDir()
sh "cmake $srcDir -DCMAKE_INSTALL_PREFIX=$installDir -DTRIQS_ROOT=$triqsDir" sh "cmake $srcDir -DCMAKE_INSTALL_PREFIX=$installDir -DTRIQS_ROOT=$triqsDir"