From 9f03870f26f821eb39fa7aa2bea9d27c6a1429dd Mon Sep 17 00:00:00 2001
From: Nils Wentzell <nwentzell@flatironinstitute.org>
Date: Thu, 11 Oct 2018 17:17:12 -0400
Subject: [PATCH] [cmake] Use CPLUS_INCLUDE_PATH over CPATH to favor -isystem
 includes

---
 Jenkinsfile                   | 2 +-
 share/app4triqs.modulefile.in | 2 +-
 share/app4triqsvars.sh.in     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c835cc67..64afe7eb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -68,7 +68,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
       checkout scm
       dir(buildDir) { withEnv(platformEnv[1].collect { it.replace('\$BREW', env.BREW) } + [
         "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",
         "CMAKE_PREFIX_PATH=$triqsDir/share/cmake"]) {
         deleteDir()
diff --git a/share/app4triqs.modulefile.in b/share/app4triqs.modulefile.in
index c6b2d12d..d34d9cc7 100644
--- a/share/app4triqs.modulefile.in
+++ b/share/app4triqs.modulefile.in
@@ -32,7 +32,7 @@ setenv          APP4TRIQS_VERSION   $version
 setenv          APP4TRIQS_GIT_HASH  $git_hash
 
 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    LD_LIBRARY_PATH     $root/lib
 prepend-path    PYTHONPATH          $root/@CPP2PY_PYTHON_LIB_DEST_ROOT@
diff --git a/share/app4triqsvars.sh.in b/share/app4triqsvars.sh.in
index 8bab403f..ebcb27a3 100644
--- a/share/app4triqsvars.sh.in
+++ b/share/app4triqsvars.sh.in
@@ -2,7 +2,7 @@
 
 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 LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/lib:$LIBRARY_PATH 
 export LD_LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/lib:$LD_LIBRARY_PATH