01/01: gnu: cmake: Add CMAKE_PREFIX_PATH as a native search path, and drop CMAKE_LIBRARY_PATH and CMAKE_INCLUDE_PATH from the cmake build system.

[Andreas Enge]

andreas pushed a commit to branch master
in repository guix.

commit 0d6f9360369749eab0b37c7c14b4db8faa318507
Author: Andreas Enge <address@hidden>
Date:   Sat Feb 28 21:49:23 2015 +0100

    gnu: cmake: Add CMAKE_PREFIX_PATH as a native search path, and drop
    CMAKE_LIBRARY_PATH and CMAKE_INCLUDE_PATH from the cmake build system.
    
    * gnu/packages/cmake.scm (cmake)[native-search-paths]: New field.
    * guix/build/cmake-build-system.scm (configure): Drop environment variables
      CMAKE_LIBRARY_PATH and CMAKE_INCLUDE_PATH.
---
 gnu/packages/cmake.scm            |    4 ++++
 guix/build/cmake-build-system.scm |    4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index c3ed4ae..1fb9241 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -101,6 +101,10 @@
        ("expat"      ,expat)
        ("bzip2"      ,bzip2)
        ("libarchive" ,libarchive)))
+    (native-search-paths
+     (list (search-path-specification
+             (variable "CMAKE_PREFIX_PATH")
+             (files '("")))))
     (home-page "http://www.cmake.org/";)
     (synopsis "Cross-platform build system")
     (description
diff --git a/guix/build/cmake-build-system.scm 
b/guix/build/cmake-build-system.scm
index 08ae73e..d8d437c 100644
--- a/guix/build/cmake-build-system.scm
+++ b/guix/build/cmake-build-system.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2013 Cyril Roelandt <address@hidden>
-;;; Copyright © 2014 Andreas Enge <address@hidden>
+;;; Copyright © 2014, 2015 Andreas Enge <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -60,8 +60,6 @@
                   ;; enable verbose output from builds
                   "-DCMAKE_VERBOSE_MAKEFILE=ON"
                   ,@configure-flags)))
-      (setenv "CMAKE_LIBRARY_PATH" (getenv "LIBRARY_PATH"))
-      (setenv "CMAKE_INCLUDE_PATH" (getenv "CPATH"))
       (format #t "running 'cmake' with arguments ~s~%" args)
       (zero? (apply system* "cmake" args)))))