LCPQ/dft_tools
3
0
Fork 0
mirror of https://github.com/triqs/dft_tools synced 2024-12-23 04:43:42 +01:00
Code Issues Releases Wiki Activity

Adjust cmake-related install dirs to more standard directories

Browse Source
This commit is contained in:
Nils Wentzell 2018-11-28 13:02:26 -05:00
parent 837c886e60
commit 0335e53adf
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -70,7 +70,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
"PATH=$triqsDir/bin:${env.BREW}/bin:/usr/bin:/bin:/usr/sbin", "PATH=$triqsDir/bin:${env.BREW}/bin:/usr/bin:/bin:/usr/sbin",
"CPLUS_INCLUDE_PATH=$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/lib/cmake/triqs"]) {
deleteDir() deleteDir()
sh "cmake $srcDir -DCMAKE_INSTALL_PREFIX=$installDir -DTRIQS_ROOT=$triqsDir" sh "cmake $srcDir -DCMAKE_INSTALL_PREFIX=$installDir -DTRIQS_ROOT=$triqsDir"
sh "make -j3" sh "make -j3"

2
share/app4triqs.modulefile.in
View File

@ -36,4 +36,4 @@ 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@
prepend-path CMAKE_PREFIX_PATH $root/share/cmake prepend-path CMAKE_PREFIX_PATH $root/lib/cmake/triqs

2
share/app4triqsvars.sh.in
View File

@ -7,4 +7,4 @@ 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
export PYTHONPATH=@CMAKE_INSTALL_PREFIX@/@CPP2PY_PYTHON_LIB_DEST_ROOT@:$PYTHONPATH export PYTHONPATH=@CMAKE_INSTALL_PREFIX@/@CPP2PY_PYTHON_LIB_DEST_ROOT@:$PYTHONPATH
export CMAKE_PREFIX_PATH=@CMAKE_INSTALL_PREFIX@/lib/cmake/app4triqs:$CMAKE_PREFIX_PATH export CMAKE_PREFIX_PATH=@CMAKE_INSTALL_PREFIX@/lib/cmake/triqs:$CMAKE_PREFIX_PATH

2
share/cmake/app4triqs-config.cmake.in
View File

@ -10,7 +10,7 @@ set(APP4TRIQS_GIT_HASH @APP4TRIQS_GIT_HASH@)
set(APP4TRIQS_ROOT @CMAKE_INSTALL_PREFIX@) set(APP4TRIQS_ROOT @CMAKE_INSTALL_PREFIX@)
# include the exported targets of this project # include the exported targets of this project
include(@CMAKE_INSTALL_PREFIX@/share/cmake/app4triqs-targets.cmake) include(@CMAKE_INSTALL_PREFIX@/lib/cmake/triqs/app4triqs-targets.cmake)
MESSAGE(STATUS "Found APP4TRIQSConfig.cmake with version ${APP4TRIQS_VERSION}, hash = ${APP4TRIQS_GIT_HASH}") MESSAGE(STATUS "Found APP4TRIQSConfig.cmake with version ${APP4TRIQS_VERSION}, hash = ${APP4TRIQS_GIT_HASH}")