From 0335e53adfe40be2a2476e186dd9bdaeac43ad4b Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Wed, 28 Nov 2018 13:02:26 -0500 Subject: [PATCH] Adjust cmake-related install dirs to more standard directories --- Jenkinsfile | 2 +- share/app4triqs.modulefile.in | 2 +- share/app4triqsvars.sh.in | 2 +- share/cmake/app4triqs-config.cmake.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 64afe7eb..8c5b73b5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -70,7 +70,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) { "PATH=$triqsDir/bin:${env.BREW}/bin:/usr/bin:/bin:/usr/sbin", "CPLUS_INCLUDE_PATH=$triqsDir/include:${env.BREW}/include", "LIBRARY_PATH=$triqsDir/lib:${env.BREW}/lib", - "CMAKE_PREFIX_PATH=$triqsDir/share/cmake"]) { + "CMAKE_PREFIX_PATH=$triqsDir/lib/cmake/triqs"]) { deleteDir() sh "cmake $srcDir -DCMAKE_INSTALL_PREFIX=$installDir -DTRIQS_ROOT=$triqsDir" sh "make -j3" diff --git a/share/app4triqs.modulefile.in b/share/app4triqs.modulefile.in index d34d9cc7..2c870cd0 100644 --- a/share/app4triqs.modulefile.in +++ b/share/app4triqs.modulefile.in @@ -36,4 +36,4 @@ prepend-path CPLUS_INCLUDE_PATH $root/include prepend-path LIBRARY_PATH $root/lib prepend-path LD_LIBRARY_PATH $root/lib 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 diff --git a/share/app4triqsvars.sh.in b/share/app4triqsvars.sh.in index 620c991c..a7df20b3 100644 --- a/share/app4triqsvars.sh.in +++ b/share/app4triqsvars.sh.in @@ -7,4 +7,4 @@ export PATH=@CMAKE_INSTALL_PREFIX@/bin:$PATH export LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/lib:$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 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 diff --git a/share/cmake/app4triqs-config.cmake.in b/share/cmake/app4triqs-config.cmake.in index 90d20551..2cd3b660 100644 --- a/share/cmake/app4triqs-config.cmake.in +++ b/share/cmake/app4triqs-config.cmake.in @@ -10,7 +10,7 @@ set(APP4TRIQS_GIT_HASH @APP4TRIQS_GIT_HASH@) set(APP4TRIQS_ROOT @CMAKE_INSTALL_PREFIX@) # 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}")