diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-11-13 00:34:16 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-11-13 00:34:16 +0100 |
| commit | 2cab1dd58b9a8fb4db8f46a0b00e1358fc0de21b (patch) | |
| tree | b0f12de9371ebbd806214df841cf3a1c116d5431 /gnu/packages/cmake.scm | |
| parent | 15abcabe4e1d34416714eae66dba32ff96d05a6f (diff) | |
| parent | de7da4e5d14a1acace1a89d9c520d336eecc7e45 (diff) | |
| download | guix-2cab1dd58b9a8fb4db8f46a0b00e1358fc0de21b.tar.gz | |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/cmake.scm')
| -rw-r--r-- | gnu/packages/cmake.scm | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index ac88e59ec1..cd82978de2 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -32,12 +32,13 @@ #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages file) + #:use-module (gnu packages ncurses) #:use-module (gnu packages xml)) (define-public cmake (package (name "cmake") - (version "3.5.2") + (version "3.6.1") (source (origin (method url-fetch) (uri (string-append "https://www.cmake.org/files/v" @@ -45,7 +46,7 @@ "/cmake-" version ".tar.gz")) (sha256 (base32 - "0ap6nlmv6nda942db43k9k9mhnm5dm3fsapzvy0vh6wq7l6l3n4j")) + "04ggm9c0zklxypm6df1v4klrrd85m6vpv13kasj42za283n9ivi8")) (patches (search-patches "cmake-fix-tests.patch")))) (build-system gnu-build-system) (arguments @@ -97,27 +98,20 @@ "--mandir=share/man" ,(string-append "--docdir=share/doc/cmake-" - (version-major+minor version))))))) - (add-after 'unpack 'remove-libarchive-version-test - ; This test check has been failing consistantly over libarchive 3.2.x - ; and cmake 3.4.x and 3.5.x so we disable it for now - (lambda _ - (substitute* - "Tests/CMakeOnly/AllFindModules/CMakeLists.txt" - (("LibArchive") "")) - #t))))) + (version-major+minor version)))))))))) (inputs `(("file" ,file) ("curl" ,curl) ("zlib" ,zlib) ("expat" ,expat) ("bzip2" ,bzip2) + ("ncurses" ,ncurses) ; required for ccmake ("libarchive" ,libarchive))) (native-search-paths (list (search-path-specification (variable "CMAKE_PREFIX_PATH") (files '(""))))) - (home-page "http://www.cmake.org/") + (home-page "https://www.cmake.org/") (synopsis "Cross-platform build system") (description "CMake is a family of tools designed to build, test and package software. |