~ruther/guix-local

0d6f9360369749eab0b37c7c14b4db8faa318507 — Andreas Enge 11 years ago 6abdad6 
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.
patch browse .tar.gz 
2 files changed, 5 insertions(+), 3 deletions(-)

M gnu/packages/cmake.scm
M guix/build/cmake-build-system.scm

M gnu/packages/cmake.scm => gnu/packages/cmake.scm +4 -0
@@ 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


M guix/build/cmake-build-system.scm => guix/build/cmake-build-system.scm +1 -3
@@ 1,7 1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015 Andreas Enge <andreas@enge.fr>
;;;
;;; 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)))))