From c387828bd23e8187b81c96265673c4750103cabe Mon Sep 17 00:00:00 2001
From: Nils Wentzell <nwentzell@flatironinstitute.org>
Date: Fri, 26 Apr 2019 10:24:46 -0400
Subject: [PATCH] [cmake] Important path/variable fixes in cmake-generated
 files

---
 share/CMakeLists.txt                  | 6 +++---
 share/app4triqsvars.sh.in             | 4 ++--
 share/cmake/app4triqs-config.cmake.in | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index 961203f6..21174a40 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -13,11 +13,11 @@ if(NOT CMAKE_INSTALL_PREFIX STREQUAL TRIQS_ROOT)
   )
  
   message(STATUS "***************************************************************")
-  message(STATUS "* Custom install Location. Use: 			         ")
+  message(STATUS "* Custom install Location. Use:                                ")
   message(STATUS "*                                                              ")
   message(STATUS "*   source ${CMAKE_INSTALL_PREFIX}/share/app4triqsvars.sh      ")
-  message(STATUS "*                                                              ") 
-  message(STATUS "* to set up the environment variables                          ") 
+  message(STATUS "*                                                              ")
+  message(STATUS "* to set up the environment variables                          ")
   message(STATUS "***************************************************************")
 
 endif()
diff --git a/share/app4triqsvars.sh.in b/share/app4triqsvars.sh.in
index a7df20b3..c99750fc 100644
--- a/share/app4triqsvars.sh.in
+++ b/share/app4triqsvars.sh.in
@@ -1,10 +1,10 @@
 # Source this in your environment.
 
-export TRIQS_ROOT=@CMAKE_INSTALL_PREFIX@
+export APP4TRIQS_ROOT=@CMAKE_INSTALL_PREFIX@
 
 export CPLUS_INCLUDE_PATH=@CMAKE_INSTALL_PREFIX@/include:$CPLUS_INCLUDE_PATH
 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/triqs:$CMAKE_PREFIX_PATH
+export CMAKE_PREFIX_PATH=@CMAKE_INSTALL_PREFIX@/lib/cmake/app4triqs:$CMAKE_PREFIX_PATH
diff --git a/share/cmake/app4triqs-config.cmake.in b/share/cmake/app4triqs-config.cmake.in
index f175ce4d..cc0c253c 100644
--- a/share/cmake/app4triqs-config.cmake.in
+++ b/share/cmake/app4triqs-config.cmake.in
@@ -14,9 +14,9 @@ set(APP4TRIQS_GIT_HASH @APP4TRIQS_GIT_HASH@)
 set(APP4TRIQS_ROOT  @CMAKE_INSTALL_PREFIX@)
 
 # Include the exported targets of this project
-include(@CMAKE_INSTALL_PREFIX@/lib/cmake/triqs/app4triqs-targets.cmake)
+include(@CMAKE_INSTALL_PREFIX@/lib/cmake/app4triqs/app4triqs-targets.cmake)
 
-MESSAGE(STATUS "Found APP4TRIQSConfig.cmake with version ${APP4TRIQS_VERSION}, hash = ${APP4TRIQS_GIT_HASH}")
+message(STATUS "Found app4triqs-config.cmake with version ${APP4TRIQS_VERSION}, hash = ${APP4TRIQS_GIT_HASH}")
 
 # Was the Project built with Documentation?
 set(APP4TRIQS_WITH_DOCUMENTATION @Build_Documentation@)