Commit Graph

59 Commits

Author SHA1 Message Date
Ludovic Courtès 9ff87bb996
Merge branch 'master' into core-updates 2019-09-17 16:27:15 +02:00
Ludovic Courtès 489d16577e
gnu: cmake: Add package variant that knows about X.509 certificates.
Fixes <https://bugs.gnu.org/37371>.

* gnu/packages/patches/cmake-curl-certificates.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/cmake.scm (cmake/fixed): New variable.
2019-09-11 00:09:39 +02:00
Marius Bakke 5a7c6d02b2
gnu: emacs-cmake-mode: Do not inherit inputs and outputs from CMake.
* gnu/packages/cmake.scm (emacs-cmake-mode)[native-inputs, inputs, outputs]:
New fields.
[arguments]: End phases on #t.
2019-08-01 15:49:28 +02:00
Marius Bakke 14767d4466
gnu: CMake: Update to 3.15.1.
* gnu/packages/cmake.scm (cmake-minimal): Update to 3.15.1.
[arguments]: Do not patch /bin/sh in removed file.
2019-07-31 14:41:36 +02:00
Marius Bakke 2489acc9bd
gnu: CMake: Update to 3.14.5.
* gnu/packages/cmake.scm (cmake-minimal): Update to 3.14.5.
2019-06-15 23:47:34 +02:00
Marius Bakke 45771d63c5
gnu: cmake: Update to 3.14.4.
* gnu/packages/cmake.scm (cmake-minimal): Update to 3.14.4.
2019-05-25 00:47:53 +02:00
Marius Bakke 57df83e07d
Merge branch 'staging' into core-updates 2019-05-25 00:25:15 +02:00
Marius Bakke de7dae6e10
gnu: CMake: Update to 3.14.3.
* gnu/packages/cmake.scm (cmake-minimal): Update to 3.14.3.
2019-05-04 16:25:52 +02:00
Maxim Cournoyer 2f33a7321e
cmake: Generate documentation.
To prevent complicating the dependencies of a core tool, a new variant,
CMAKE-MINIMAL is introduced and the CMake build system is configured to use it
by default.  The regular CMAKE package gains a manpage, info manual as well
as HTML documentation.

Fixes issue #33497 (https://bugs.gnu.org/33497).

* gnu/packages/cmake.scm (gnu): Use modules (gnu packages python-xyz),
(gnu packages texinfo) and (srfi srfi-1).
(cmake-minimal): Rename the original cmake variable to this.
[phases]{configure}: Extract the configure script arguments to...
[configure-flags]: here.
[properties]: Set the HIDDEN? property to #t.
(cmake): New variable, which inherits from CMAKE-MINIMAL.
[phases]{move-html-doc}: Add phase.
[native-inputs]: Add PYTHON-SPHINX and TEXINFO.
[outputs]: Add the "doc" output.
[properties]: Clear the inherited HIDDEN? property.
* guix/build-system/cmake.scm (default-cmake): Use CMAKE-MINIMAL instead of
CMAKE.
2019-03-20 21:38:19 -04:00
Marius Bakke e16cf2666f
gnu: cmake: Update to 3.14.0.
* gnu/packages/cmake.scm (cmake): Update to 3.14.0.
2019-03-17 17:01:19 +01:00
Marius Bakke 546bee4002
gnu: cmake: Try CPATH and C_INCLUDE_PATH when finding system libraries.
* gnu/packages/cmake.scm (cmake)[arguments]: Try both CPATH and C_INCLUDE_PATH
instead of just the latter.
2019-02-09 21:53:41 +01:00
Marius Bakke 036653918e
gnu: CMake: Update to 3.13.1.
* gnu/packages/cmake.scm (cmake): Update to 3.13.1.
2018-12-12 20:49:14 +01:00
Marius Bakke 334bd08c42
gnu: cmake: Update to 3.12.2.
* gnu/packages/cmake.scm (cmake): Update to 3.12.2.
2018-09-09 17:59:36 +02:00
Marius Bakke f203e53386
gnu: cmake: Update to 3.12.1.
* gnu/packages/cmake.scm (cmake): Update to 3.12.1.
2018-08-21 17:24:27 +02:00
Marius Bakke f2ca4fa5c3
gnu: cmake: Update to 3.12.0.
* gnu/packages/cmake.scm (cmake): Update to 3.12.0.
2018-07-21 02:45:55 +02:00
Tobias Geerinckx-Rice 38a978154e
gnu: cmake: Update to 3.11.4.
* gnu/packages/cmake.scm (cmake): Update to 3.11.4.
2018-07-08 20:14:40 +02:00
Tobias Geerinckx-Rice 4f3958dacb
gnu: cmake: Update to 3.11.3.
* gnu/packages/cmake.scm (cmake): Update to 3.11.3.
2018-06-12 15:06:23 +02:00
Ricardo Wurmus 8709624756
Merge branch 'origin/core-updates-next' into core-updates 2018-06-06 23:01:48 +02:00
Oleg Pykhalov ffd526e61a
gnu: cmake: Delete Emacs library.
* gnu/packages/cmake.scm (cmake)[arguments]: Delete Emacs library.
2018-05-25 12:18:55 +03:00
Mark H Weaver 9d10a63402
Merge branch 'master' into core-updates 2018-05-24 02:34:08 -04:00
Mark H Weaver 4935701a4a
Revert "gnu: cmake: Delete Emacs library."
This reverts commit f037673c31.
2018-05-22 14:39:53 -04:00
Oleg Pykhalov aa4818c33b
gnu: cmake.scm: Add missing module.
* gnu/packages/cmake.scm: Import emacs-build-system.
2018-05-22 17:37:14 +03:00
Oleg Pykhalov bbdf36666b
gnu: Add emacs-cmake-mode.
* gnu/packages/cmake.scm (emacs-cmake-mode): New public variable.
2018-05-22 17:20:46 +03:00
Oleg Pykhalov f037673c31
gnu: cmake: Delete Emacs library.
* gnu/packages/finance.scm (cmake)[arguments]: Delete Emacs library.
2018-05-22 17:16:40 +03:00
Marius Bakke c98fe1d064
gnu: cmake: Update to 3.11.1.
* gnu/packages/cmake.scm (cmake): Update to 3.11.1.
2018-04-30 20:48:55 +02:00
Marius Bakke 12cb6c31df
gnu: cmake: Update to 3.11.0.
* gnu/packages/cmake.scm (cmake): Update to 3.11.0.
[arguments]: Enable fixed test.  Adjust file substitutions.  Run tests and
"./configure" in parallel.
(cmake-3.11): Remove variable.
* gnu/packages/storage.scm (ceph)[arguments]: Remove #:cmake.
2018-03-29 16:54:52 +02:00
Arun Isaac 12420c800e
gnu: cmake: Re-indent.
* gnu/packages/cmake.scm (cmake): Re-indent.
2018-03-23 11:32:33 +05:30
Arun Isaac 89db6c6de9
gnu: cmake: Update to 3.10.2.
* gnu/packages/cmake.scm (cmake): Update to 3.10.2.
[source]: Remove cmake-fix-tests patch.
Do not remove bundled cmlibuv.
[arguments]: Replace system* with invoke.
[inputs]: Add rhash. Sort.
[home-page]: Update URL.
* gnu/packages/patches/cmake-fix-tests.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Unregister it.
2018-03-23 11:32:24 +05:30
Marius Bakke 1568cc14fa
gnu: Add cmake@3.11.
* gnu/packages/cmake.scm (cmake-3.11): New public variable.
2018-03-04 17:54:40 +01:00
Marius Bakke d270c606b3
gnu: cmake: Run tests in parallel.
* gnu/packages/cmake.scm (cmake)[arguments]: Add 'set-test-environment' phase.
2017-02-21 14:50:51 +01:00
Marius Bakke db909bf23c
gnu: cmake: Remove bundled software.
* gnu/packages/cmake.scm (cmake)[source]: Add 'snippet' to remove bundled
libraries.
[arguments]: Drop removed files from 'patch-bin-sh' phase.
[license]: Update for remaining software.
2017-02-21 14:50:50 +01:00
Marius Bakke 4bbb7d4865
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.
2017-02-21 14:50:50 +01:00
Efraim Flashner 21e5e1e070
gnu: cmake: Build 'ccmake' binary.
* gnu/packages/cmake.scm (cmake)[inputs]: Add ncurses.
2016-10-07 12:26:36 +03:00
Efraim Flashner 97127431ee
gnu: cmake: Enable libarchive tests.
* gnu/packages/cmake.scm (cmake)[arguments]: Remove phase disabling
libarchive tests.
[home-page]: Use https.
2016-08-29 23:42:18 +03:00
Efraim Flashner 9bb1826651
gnu: cmake: Update to 3.6.1.
* gnu/packages/cmake.scm (cmake): Update to 3.6.1.
2016-08-16 09:06:22 +03:00
Efraim Flashner a12f6f498a
gnu: cmake: Update to 3.5.2.
* gnu/packages/cmake.scm (cmake): Update to 3.5.2.
2016-06-22 06:51:53 +03:00
Efraim Flashner 6e261af1e7
gnu: cmake: Use 'modify-phases'.
* gnu/packages/cmake.scm (cmake)[arguments]: Use 'modify-phases'.
2016-06-22 06:51:53 +03:00
Efraim Flashner 28b49c0791
gnu: cmake: Disable checking for libarchive in tests.
* gnu/packages/cmake.scm (cmake)[arguments]: Remove check on libarchive.
2016-06-22 06:51:47 +03:00
Mathieu Lirzin c3052d6bcd Merge branch 'master' into core-updates 2016-05-02 17:53:40 +02:00
Alex Kost fc1adab148 gnu: packages: Use 'search-patches' everywhere.
* gnu/packages/abiword.scm: Use 'search-patches' for 'patches' field.
* gnu/packages/acl.scm: Likewise.
* gnu/packages/admin.scm: Likewise.
* gnu/packages/algebra.scm: Likewise.
* gnu/packages/animation.scm: Likewise.
* gnu/packages/apr.scm: Likewise.
* gnu/packages/audacity.scm: Likewise.
* gnu/packages/audio.scm: Likewise.
* gnu/packages/autotools.scm: Likewise.
* gnu/packages/avahi.scm: Likewise.
* gnu/packages/backup.scm: Likewise.
* gnu/packages/base.scm: Likewise.
* gnu/packages/bash.scm: Likewise.
* gnu/packages/bioinformatics.scm: Likewise.
* gnu/packages/cdrom.scm: Likewise.
* gnu/packages/ci.scm: Likewise.
* gnu/packages/cmake.scm: Likewise.
* gnu/packages/cpio.scm: Likewise.
* gnu/packages/cross-base.scm: Likewise.
* gnu/packages/dico.scm: Likewise.
* gnu/packages/doxygen.scm: Likewise.
* gnu/packages/ebook.scm: Likewise.
* gnu/packages/elf.scm: Likewise.
* gnu/packages/emacs.scm: Likewise.
* gnu/packages/engineering.scm: Likewise.
* gnu/packages/firmware.scm: Likewise.
* gnu/packages/flashing-tools.scm: Likewise.
* gnu/packages/fltk.scm: Likewise.
* gnu/packages/ftp.scm: Likewise.
* gnu/packages/games.scm: Likewise.
* gnu/packages/gawk.scm: Likewise.
* gnu/packages/gcc.scm: Likewise.
* gnu/packages/gd.scm: Likewise.
* gnu/packages/ghostscript.scm: Likewise.
* gnu/packages/glib.scm: Likewise.
* gnu/packages/gnome.scm: Likewise.
* gnu/packages/gnucash.scm: Likewise.
* gnu/packages/gnunet.scm: Likewise.
* gnu/packages/gnupg.scm: Likewise.
* gnu/packages/gnuzilla.scm: Likewise.
* gnu/packages/graphics.scm: Likewise.
* gnu/packages/grub.scm: Likewise.
* gnu/packages/gtk.scm: Likewise.
* gnu/packages/guile.scm: Likewise.
* gnu/packages/icu4c.scm: Likewise.
* gnu/packages/idutils.scm: Likewise.
* gnu/packages/image.scm: Likewise.
* gnu/packages/imagemagick.scm: Likewise.
* gnu/packages/irc.scm: Likewise.
* gnu/packages/ldc.scm: Likewise.
* gnu/packages/libcanberra.scm: Likewise.
* gnu/packages/libevent.scm: Likewise.
* gnu/packages/libreoffice.scm: Likewise.
* gnu/packages/libunwind.scm: Likewise.
* gnu/packages/libusb.scm: Likewise.
* gnu/packages/linux.scm: Likewise.
* gnu/packages/lirc.scm: Likewise.
* gnu/packages/llvm.scm: Likewise.
* gnu/packages/lsh.scm: Likewise.
* gnu/packages/lua.scm: Likewise.
* gnu/packages/lxqt.scm: Likewise.
* gnu/packages/mail.scm: Likewise.
* gnu/packages/maths.scm: Likewise.
* gnu/packages/mcrypt.scm: Likewise.
* gnu/packages/messaging.scm: Likewise.
* gnu/packages/mit-krb5.scm: Likewise.
* gnu/packages/mp3.scm: Likewise.
* gnu/packages/multiprecision.scm: Likewise.
* gnu/packages/music.scm: Likewise.
* gnu/packages/ninja.scm: Likewise.
* gnu/packages/nvi.scm: Likewise.
* gnu/packages/ocaml.scm: Likewise.
* gnu/packages/orpheus.scm: Likewise.
* gnu/packages/ots.scm: Likewise.
* gnu/packages/parallel.scm: Likewise.
* gnu/packages/patchutils.scm: Likewise.
* gnu/packages/pcre.scm: Likewise.
* gnu/packages/pdf.scm: Likewise.
* gnu/packages/perl.scm: Likewise.
* gnu/packages/plotutils.scm: Likewise.
* gnu/packages/polkit.scm: Likewise.
* gnu/packages/pulseaudio.scm: Likewise.
* gnu/packages/python.scm: Likewise.
* gnu/packages/qemu.scm: Likewise.
* gnu/packages/qt.scm: Likewise.
* gnu/packages/ratpoison.scm: Likewise.
* gnu/packages/rdf.scm: Likewise.
* gnu/packages/readline.scm: Likewise.
* gnu/packages/rush.scm: Likewise.
* gnu/packages/scheme.scm: Likewise.
* gnu/packages/screen.scm: Likewise.
* gnu/packages/sdl.scm: Likewise.
* gnu/packages/slim.scm: Likewise.
* gnu/packages/ssh.scm: Likewise.
* gnu/packages/tcl.scm: Likewise.
* gnu/packages/tcsh.scm: Likewise.
* gnu/packages/texinfo.scm: Likewise.
* gnu/packages/tls.scm: Likewise.
* gnu/packages/tor.scm: Likewise.
* gnu/packages/tv.scm: Likewise.
* gnu/packages/valgrind.scm: Likewise.
* gnu/packages/version-control.scm: Likewise.
* gnu/packages/video.scm: Likewise.
* gnu/packages/vpn.scm: Likewise.
* gnu/packages/vtk.scm: Likewise.
* gnu/packages/w3m.scm: Likewise.
* gnu/packages/web.scm: Likewise.
* gnu/packages/wicd.scm: Likewise.
* gnu/packages/wm.scm: Likewise.
* gnu/packages/xdisorg.scm: Likewise.
* gnu/packages/xfce.scm: Likewise.
* gnu/packages/xiph.scm: Likewise.
* gnu/packages/xml.scm: Likewise.
* gnu/packages/xorg.scm: Likewise.
* gnu/packages/zip.scm: Likewise.
2016-04-14 10:38:21 +03:00
Efraim Flashner 2dbed47f5c gnu: cmake: Update to 3.5.0.
* gnu/packages/cmake.scm (cmake): Update to 3.5.0.
2016-03-17 08:47:14 +02:00
Efraim Flashner 3b698589d2 gnu: cmake: Update to 3.4.3.
* gnu/packages/cmake.scm (cmake): Update to 3.4.3.
2016-03-05 18:58:24 +02:00
Ludovic Courtès e8e2e18b84 gnu: Read 'C_INCLUDE_PATH' instead of 'CPATH'.
This is a followup to 009b53fd.

* gnu/packages/cmake.scm (cmake)[arguments]: Use (getenv
"C_INCLUDE_PATH") instead of (getenv "CPATH").
* gnu/packages/package-management.scm (rpm)[arguments]: Likewise.
* gnu/packages/video.scm (avidemux)[arguments]: Likewise.
* gnu/packages/webkit.scm (webkitgtk)[arguments]: Likewise.
* gnu/packages/cross-base.scm (cross-gcc-arguments): Likewise, and unset
'C_INCLUDE_PATH' and 'CPLUS_INCLUDE_PATH'.
2016-01-05 14:11:54 +01:00
宋文武 a124bbd2f4 gnu: Adjust formatting as recommended by 'guix lint'.
* gnu/packages/aidc.scm (barcode, qrencode),
  gnu/packages/bash.scm (bash, bash-completion),
  gnu/packages/busybox.scm (busybox),
  gnu/packages/cdrom.scm (cdparanoia),
  gnu/packages/cmake.scm (cmake),
  gnu/packages/conkeror.scm (conkeror),
  gnu/packages/cook.scm (cook),
  gnu/packages/curl.scm (curl),
  gnu/packages/docbook.scm (docbook-xsl),
  gnu/packages/enlightenment.scm (enlightenment),
  gnu/packages/games.scm (abbaye),
  gnu/packages/geeqie.scm (exiv2),
  gnu/packages/gimp.scm (gegl),
  gnu/packages/gl.scm (glu, freeglut, ftgl),
  gnu/packages/glib.scm (glib),
  gnu/packages/gnome.scm (orbit2, gconf, geocode-glib),
  gnu/packages/gstreamer.scm (gstreamer, gst-plugins-base),
  gnu/packages/linux.scm (util-linux),
  gnu/packages/lisp.scm (gcl, ecl),
  gnu/packages/maths.scm (gnuplot, hdf5),
  gnu/packages/ssh.scm (dropbear),
  gnu/packages/web.scm (json-c): Remove tabulations and trailing
  white spaces or reformat to fit within 80 columns.
* gnu/packages/audio.scm (aubio),
  gnu/packages/emacs.scm (emacs-s),
  gnu/packages/engineering.scm (geda-gaf),
  gnu/packages/games.scm (dosbox),
  gnu/packages/gnome.scm (gusb),
  gnu/packages/gtk.scm (gtk+),
  gnu/packages/guile.scm (guile-wisp),
  gnu/packages/hurd.scm (hurd-headers),
  gnu/packages/wm.scm (i3-wm): Adjust synopsis or description.
2015-11-13 23:45:55 +08:00
Ludovic Courtès 4ebdefc07a gnu: cmake: Download over HTTPS.
Reported by Gxsdnewb on #guix.

* gnu/packages/cmake.scm (cmake)[source]: Use 'https' URL.
2015-11-04 00:12:19 +01:00
宋文武 ecd9c37f1f gnu: cmake: Update to 3.3.2.
* gnu/packages/cmake.scm (cmake): Update to 3.3.2.
2015-10-17 14:47:28 +08:00
宋文武 1b7b7f27bd gnu: cmake: Update to 3.3.1.
* gnu/packages/cmake.scm (cmake): Update to 3.3.1.  Enable parallel
  tests.
2015-09-14 21:05:38 +08:00
宋文武 e32316e62f gnu: cmake: Disable parallel tests.
* gnu/packages/cmake.scm (cmake)[arguments]: Add #:parallel-tests?.
  Set 'CTEST_OUTPUT_ON_FAILURE' to 'TRUE' in 'set-paths phase.
2015-04-28 17:16:18 +08:00
宋文武 477a752e89 gnu: cmake: Update to 3.2.2.
* gnu/packages/cmake.scm (cmake): Update to 3.2.2.
* gnu/packages/patches/cmake-fix-tests.patch: Skip test for BundleUtilities.
2015-04-28 15:45:54 +08:00
Andreas Enge 0d6f936036 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.
2015-03-14 16:06:55 +01:00