nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Andreas Enge 2015-02-28 21:49:23 +01:00
parent 6abdad698b
commit 0d6f936036
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnu/packages/cmake.scm
View File

@ -101,6 +101,10 @@
("expat" ,expat) ("expat" ,expat)
("bzip2" ,bzip2) ("bzip2" ,bzip2)
("libarchive" ,libarchive))) ("libarchive" ,libarchive)))
(native-search-paths
(list (search-path-specification
(variable "CMAKE_PREFIX_PATH")
(files '("")))))
(home-page "http://www.cmake.org/") (home-page "http://www.cmake.org/")
(synopsis "Cross-platform build system") (synopsis "Cross-platform build system")
(description (description

4
guix/build/cmake-build-system.scm
View File

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> ;;; 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. ;;; This file is part of GNU Guix.
;;; ;;;
@ -60,8 +60,6 @@
;; enable verbose output from builds ;; enable verbose output from builds
"-DCMAKE_VERBOSE_MAKEFILE=ON" "-DCMAKE_VERBOSE_MAKEFILE=ON"
,@configure-flags))) ,@configure-flags)))
(setenv "CMAKE_LIBRARY_PATH" (getenv "LIBRARY_PATH"))
(setenv "CMAKE_INCLUDE_PATH" (getenv "CPATH"))
(format #t "running 'cmake' with arguments ~s~%" args) (format #t "running 'cmake' with arguments ~s~%" args)
(zero? (apply system* "cmake" args))))) (zero? (apply system* "cmake" args)))))