mirror of
https://github.com/triqs/dft_tools
synced 2024-06-30 00:44:34 +02:00
[cmake] Use CPLUS_INCLUDE_PATH over CPATH to favor -isystem includes
This commit is contained in:
parent
e95982c906
commit
9f03870f26
2
Jenkinsfile
vendored
2
Jenkinsfile
vendored
|
@ -68,7 +68,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
|
||||||
checkout scm
|
checkout scm
|
||||||
dir(buildDir) { withEnv(platformEnv[1].collect { it.replace('\$BREW', env.BREW) } + [
|
dir(buildDir) { withEnv(platformEnv[1].collect { it.replace('\$BREW', env.BREW) } + [
|
||||||
"PATH=$triqsDir/bin:${env.BREW}/bin:/usr/bin:/bin:/usr/sbin",
|
"PATH=$triqsDir/bin:${env.BREW}/bin:/usr/bin:/bin:/usr/sbin",
|
||||||
"CPATH=$triqsDir/include:${env.BREW}/include",
|
"CPLUS_INCLUDE_PATH=$triqsDir/include:${env.BREW}/include",
|
||||||
"LIBRARY_PATH=$triqsDir/lib:${env.BREW}/lib",
|
"LIBRARY_PATH=$triqsDir/lib:${env.BREW}/lib",
|
||||||
"CMAKE_PREFIX_PATH=$triqsDir/share/cmake"]) {
|
"CMAKE_PREFIX_PATH=$triqsDir/share/cmake"]) {
|
||||||
deleteDir()
|
deleteDir()
|
||||||
|
|
|
@ -32,7 +32,7 @@ setenv APP4TRIQS_VERSION $version
|
||||||
setenv APP4TRIQS_GIT_HASH $git_hash
|
setenv APP4TRIQS_GIT_HASH $git_hash
|
||||||
|
|
||||||
prepend-path PATH $root/bin
|
prepend-path PATH $root/bin
|
||||||
prepend-path CPATH $root/include
|
prepend-path CPLUS_INCLUDE_PATH $root/include
|
||||||
prepend-path LIBRARY_PATH $root/lib
|
prepend-path LIBRARY_PATH $root/lib
|
||||||
prepend-path LD_LIBRARY_PATH $root/lib
|
prepend-path LD_LIBRARY_PATH $root/lib
|
||||||
prepend-path PYTHONPATH $root/@CPP2PY_PYTHON_LIB_DEST_ROOT@
|
prepend-path PYTHONPATH $root/@CPP2PY_PYTHON_LIB_DEST_ROOT@
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
export TRIQS_ROOT=@CMAKE_INSTALL_PREFIX@
|
export TRIQS_ROOT=@CMAKE_INSTALL_PREFIX@
|
||||||
|
|
||||||
export CPATH=@CMAKE_INSTALL_PREFIX@/include:$CPATH
|
export CPLUS_INCLUDE_PATH=@CMAKE_INSTALL_PREFIX@/include:$CPLUS_INCLUDE_PATH
|
||||||
export PATH=@CMAKE_INSTALL_PREFIX@/bin:$PATH
|
export PATH=@CMAKE_INSTALL_PREFIX@/bin:$PATH
|
||||||
export LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/lib:$LIBRARY_PATH
|
export LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/lib:$LIBRARY_PATH
|
||||||
export LD_LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/lib:$LD_LIBRARY_PATH
|
export LD_LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/lib:$LD_LIBRARY_PATH
|
||||||
|
|
Loading…
Reference in New Issue
Block a user