summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorAndreas Enge <andreas@enge.fr>2015-02-28 21:49:23 +0100
committerAndreas Enge <andreas@enge.fr>2015-03-14 16:06:55 +0100
commit0d6f9360369749eab0b37c7c14b4db8faa318507 (patch)
treec4299d5c66c9b0f9cf1fafc9c71aaa66e0b12bc5 /gnu
parent6abdad698bd131ec50670cceb55e2e731f9da5d9 (diff)
downloadguix-0d6f9360369749eab0b37c7c14b4db8faa318507.tar.gz
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.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/cmake.scm4
1 files changed, 4 insertions, 0 deletions
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index c3ed4ae81f..1fb9241596 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