From 9c6917526c7a21e99cbabb8a88c4ca259ca6e6b9 Mon Sep 17 00:00:00 2001
From: Nils Wentzell <nwentzell@flatironinstitute.org>
Date: Mon, 4 Mar 2024 17:25:14 -0500
Subject: [PATCH 1/3] [cmake] Do not define DEBUG macros for RelWithDebInfo
 builds

---
 c++/app4triqs/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/c++/app4triqs/CMakeLists.txt b/c++/app4triqs/CMakeLists.txt
index 4d12e77..fda42ad 100644
--- a/c++/app4triqs/CMakeLists.txt
+++ b/c++/app4triqs/CMakeLists.txt
@@ -15,9 +15,9 @@ target_include_directories(${PROJECT_NAME}_c SYSTEM INTERFACE $<INSTALL_INTERFAC
 target_compile_definitions(${PROJECT_NAME}_c PUBLIC
 				APP4TRIQS_GIT_HASH=${PROJECT_GIT_HASH}
 				TRIQS_GIT_HASH=${TRIQS_GIT_HASH}
-				$<$<CONFIG:Debug,RelWithDebInfo>:APP4TRIQS_DEBUG>
-				$<$<CONFIG:Debug,RelWithDebInfo>:TRIQS_DEBUG>
-				$<$<CONFIG:Debug,RelWithDebInfo>:TRIQS_ARRAYS_ENFORCE_BOUNDCHECK>
+				$<$<CONFIG:Debug>:APP4TRIQS_DEBUG>
+				$<$<CONFIG:Debug>:TRIQS_DEBUG>
+				$<$<CONFIG:Debug>:TRIQS_ARRAYS_ENFORCE_BOUNDCHECK>
 			  )
 
 # Install library and headers

From 44580aad298c14abe8267f6a0d60bdb9a24db023 Mon Sep 17 00:00:00 2001
From: Nils Wentzell <nwentzell@flatironinstitute.org>
Date: Mon, 4 Mar 2024 17:51:58 -0500
Subject: [PATCH 2/3] Additional corrections to 8d850803

---
 c++/app4triqs/CMakeLists.txt | 2 +-
 share/app4triqsvars.sh.in    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/c++/app4triqs/CMakeLists.txt b/c++/app4triqs/CMakeLists.txt
index fda42ad..5f51a38 100644
--- a/c++/app4triqs/CMakeLists.txt
+++ b/c++/app4triqs/CMakeLists.txt
@@ -11,7 +11,7 @@ set_target_properties(${PROJECT_NAME}_c PROPERTIES
   VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
 )
 target_include_directories(${PROJECT_NAME}_c PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/c++>)
-target_include_directories(${PROJECT_NAME}_c SYSTEM INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>)
+target_include_directories(${PROJECT_NAME}_c SYSTEM INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include>)
 target_compile_definitions(${PROJECT_NAME}_c PUBLIC
 				APP4TRIQS_GIT_HASH=${PROJECT_GIT_HASH}
 				TRIQS_GIT_HASH=${TRIQS_GIT_HASH}
diff --git a/share/app4triqsvars.sh.in b/share/app4triqsvars.sh.in
index 487b8bc..a499f10 100644
--- a/share/app4triqsvars.sh.in
+++ b/share/app4triqsvars.sh.in
@@ -2,8 +2,8 @@
 
 export @PROJECT_NAME@_ROOT=@CMAKE_INSTALL_PREFIX@
 
-export CPLUS_INCLUDE_PATH=@CMAKE_INSTALL_FULL_INCLUDEDIR@:$CPLUS_INCLUDE_PATH
-export PATH=@CMAKE_INSTALL_FULL_BINDIR@:$PATH
+export CPLUS_INCLUDE_PATH=@CMAKE_INSTALL_PREFIX@/include:$CPLUS_INCLUDE_PATH
+export PATH=@CMAKE_INSTALL_PREFIX@/bin:$PATH
 export LIBRARY_PATH=@CMAKE_INSTALL_FULL_LIBDIR@:$LIBRARY_PATH
 export LD_LIBRARY_PATH=@CMAKE_INSTALL_FULL_LIBDIR@:$LD_LIBRARY_PATH
 export CMAKE_PREFIX_PATH=@CMAKE_INSTALL_PREFIX@:$CMAKE_PREFIX_PATH

From a3a49e514af824a6027316ba4f2f784f94da8379 Mon Sep 17 00:00:00 2001
From: Thomas Hahn <thomas.hahn01@gmail.com>
Date: Tue, 5 Mar 2024 10:11:26 -0500
Subject: [PATCH 3/3] Update macos build instructions in Jenkinsfile and
 build.yml

---
 .github/workflows/build.yml | 9 +++++++--
 Jenkinsfile                 | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6451ee9..15f352c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -85,8 +85,13 @@ jobs:
       if: matrix.os == 'macos-12'
       run: |
         brew install ccache gcc@12 llvm boost fftw hdf5 open-mpi openblas
-        pip3 install mako numpy scipy mpi4py
-        pip3 install -r requirements.txt
+        mkdir $HOME/.venv
+        python3 -m venv $HOME/.venv/my_python
+        source $HOME/.venv/my_python/bin/activate
+        pip install mako numpy scipy mpi4py
+        pip install -r requirements.txt
+        echo "VIRTUAL_ENV=$VIRTUAL_ENV" >> $GITHUB_ENV
+        echo "PATH=$PATH" >> $GITHUB_ENV
 
     - name: add clang cxxflags
       if: ${{ contains(matrix.cxx, 'clang') }}
diff --git a/Jenkinsfile b/Jenkinsfile
index 4097b7b..ff81d63 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -89,6 +89,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
           "LD_LIBRARY_PATH=$hdf5/lib",
           "PYTHONPATH=$installDir/lib/python3.9/site-packages",
           "CMAKE_PREFIX_PATH=$venv/lib/cmake/triqs",
+          "VIRTUAL_ENV=$venv",
           "OMP_NUM_THREADS=2"]) {
         deleteDir()
         /* note: this is installing into the parent (triqs) venv (install dir), which is thus shared among apps and so not be completely safe */