07/08: gnu: cmake: Try CPATH and C_INCLUDE_PATH when finding system libraries.

[Marius Bakke]

mbakke pushed a commit to branch wip-gcc7
in repository guix.

commit 0879390a879a106cb6883c77313b9d108d541a6f
Author: Marius Bakke <address@hidden>
Date:   Sat Oct 6 14:48:07 2018 +0200

    gnu: cmake: Try CPATH and C_INCLUDE_PATH when finding system libraries.
    
    * gnu/packages/cmake.scm (cmake)[arguments]: Try both CPATH and 
C_INCLUDE_PATH
    instead of just the latter.
---
 gnu/packages/cmake.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index 5abf087..3f3f1c1 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -116,7 +116,8 @@
              ;; Help cmake's bootstrap process to find system libraries
              (begin
                (setenv "CMAKE_LIBRARY_PATH" (getenv "LIBRARY_PATH"))
-               (setenv "CMAKE_INCLUDE_PATH" (getenv "C_INCLUDE_PATH"))
+               (setenv "CMAKE_INCLUDE_PATH" (or (getenv "CPATH")
+                                                (getenv "C_INCLUDE_PATH")))
                #t)))
          (replace 'configure
            (lambda* (#:key outputs #:allow-other-keys)