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

gnu: cmake: Update to 3.7.2. 

* gnu/packages/cmake.scm (cmake): Update to 3.7.2.
[arguments]: Fix truthiness of some phases.
[inputs]: Add LIBUV.
This commit is contained in:
Marius Bakke 2017-02-21 03:34:36 +01:00
parent 8505eb19a4
commit 4bbb7d4865
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/cmake.scm
View File

@ -32,13 +32,14 @@
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages file) #:use-module (gnu packages file)
#:use-module (gnu packages libevent)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages xml)) #:use-module (gnu packages xml))
(define-public cmake (define-public cmake
(package (package
(name "cmake") (name "cmake")
(version "3.6.1") (version "3.7.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.cmake.org/files/v" (uri (string-append "https://www.cmake.org/files/v"
@ -46,7 +47,7 @@
"/cmake-" version ".tar.gz")) "/cmake-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"04ggm9c0zklxypm6df1v4klrrd85m6vpv13kasj42za283n9ivi8")) "1q6a60695prpzzsmczm2xrgxdb61fyjznb04dr6yls6iwv24c4nw"))
(patches (search-patches "cmake-fix-tests.patch")))) (patches (search-patches "cmake-fix-tests.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -72,7 +73,8 @@
"Utilities/cmlibarchive/libarchive/archive_write_set_format_shar.c" "Utilities/cmlibarchive/libarchive/archive_write_set_format_shar.c"
"Tests/CMakeLists.txt" "Tests/CMakeLists.txt"
"Tests/RunCMake/File_Generate/RunCMakeTest.cmake") "Tests/RunCMake/File_Generate/RunCMakeTest.cmake")
(("/bin/sh") (which "sh"))))) (("/bin/sh") (which "sh")))
#t))
(add-before 'configure 'set-paths (add-before 'configure 'set-paths
(lambda _ (lambda _
;; Help cmake's bootstrap process to find system libraries ;; Help cmake's bootstrap process to find system libraries
@ -80,7 +82,8 @@
(setenv "CMAKE_LIBRARY_PATH" (getenv "LIBRARY_PATH")) (setenv "CMAKE_LIBRARY_PATH" (getenv "LIBRARY_PATH"))
(setenv "CMAKE_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")) (setenv "CMAKE_INCLUDE_PATH" (getenv "C_INCLUDE_PATH"))
;; Get verbose output from failed tests ;; Get verbose output from failed tests
(setenv "CTEST_OUTPUT_ON_FAILURE" "TRUE")))) (setenv "CTEST_OUTPUT_ON_FAILURE" "TRUE")
#t)))
(replace 'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
@ -106,6 +109,7 @@
("expat" ,expat) ("expat" ,expat)
("bzip2" ,bzip2) ("bzip2" ,bzip2)
("ncurses" ,ncurses) ; required for ccmake ("ncurses" ,ncurses) ; required for ccmake
("libuv" ,libuv)
("libarchive" ,libarchive))) ("libarchive" ,libarchive)))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification