3
5
Fork 0
mirror of git://git.savannah.gnu.org/guix.git synced 2023-12-14 03:33:07 +01:00
Commit graph

87 commits

Author SHA1 Message Date
Greg Hogan
4969b51d17
gnu: cmake: Update to 3.19.2.
* gnu/packages/cmake.scm (cmake): Update to 3.19.2.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
2020-12-26 19:18:19 +08:00
Tobias Geerinckx-Rice
40e96a4f3a
gnu: cmake: Update to 3.19.1.
* gnu/packages/cmake.scm (cmake): Update to 3.19.1.
2020-11-26 23:32:29 +01:00
Maxim Cournoyer
5458648302
gnu: cmake: Update to 3.19.0.
* gnu/packages/cmake.scm (cmake): Update to 3.19.0.
[source]: Modify inherited source to adjust the hash as well as the snippet so
that the "Utilities/cm3p" sub-directory is preserved.
[phases]{patch-bin-sh, check}: Temporarily overrides until the next rebuild
cycle.
2020-11-24 02:20:31 -05:00
b8515f729b
gnu: cmake: Update source URI.
* gnu/packages/cmake.scm (cmake-bootstrap)[source]: Update to new source
URI.
2020-11-08 23:35:01 +02:00
Jan (janneke) Nieuwenhuizen
a7c3c5dcca
gnu: cmake: Remove "libuv" dependency for the Hurd.
* gnu/packages/cmake.scm (cmake-bootstrap)[inputs]: When compiling for the
Hurd, remove "libuv".
2020-04-20 08:00:25 +02:00
Marius Bakke
aca00b0a36
gnu: CMake: Update to 3.16.5.
* gnu/packages/cmake.scm (cmake-bootstrap): Update to 3.16.5.
2020-03-05 23:36:07 +01:00
Marius Bakke
c37f9be952
gnu: CMake: Update to 3.16.4.
* gnu/packages/cmake.scm (cmake-bootstrap): Update to 3.16.4.
2020-02-15 22:02:57 +01:00
Marius Bakke
f9dcc39ac1
gnu: CMake: Do not use source files from system libarchive.
* gnu/packages/cmake.scm (%common-build-phases): Remove phase
'use-system-libarchive'.
(%preserved-third-party-files): New variable.
(cmake-bootstrap)[native-inputs]: Remove.
[source](snippet): Rewrite in terms of FILE-SYSTEM-FOLD, and
preserve two files from the bundled libarchive.
(cmake-minimal)[source](snippet): Adjust accordingly.
2020-02-15 22:02:57 +01:00
Marius Bakke
ac841750a5
gnu: cmake: Fix cross-compilation.
* gnu/packages/cmake.scm (cmake-bootstrap)[native-inputs]: Move everything
except (PACKAGE-SOURCE LIBARCHIVE) ...
[inputs]: ... here.
* gnu/packages/cmake.scm (cmake-minimal)[native-inputs, inputs]: Adjust accordingly.
2020-01-26 13:39:19 +01:00
Marius Bakke
28ba01aec6
gnu: cmake: Enable debugging information.
* gnu/packages/cmake.scm (cmake)[arguments]: Set #:build-type.
2020-01-26 13:39:18 +01:00
Marius Bakke
11f4d87756
gnu: cmake: Remove bundled LibUV.
* gnu/packages/cmake.scm (cmake-minimal)[source](snippet): Delete
'Utilities/cmlibuv'.
2020-01-26 13:39:18 +01:00
Marius Bakke
013c5c23f9
gnu: cmake, cmake-minimal: Use cmake-build-system.
This allows removing the bundled LibUV in a subsequent commit.  This commit
alone makes no functional changes apart from the build system adjustments.

* gnu/packages/cmake.scm (%common-build-phases, %common-disabled-tests): New
variables.
(cmake-bootstrap)[arguments]: Refactor to use the shared phases and tests.
(cmake-minimal)[build-system]: Change to CMAKE-BUILD-SYSTEM.
[arguments]: Adjust accordingly.
(cmake)[arguments]: Likewise.
2020-01-26 13:38:57 +01:00
Marius Bakke
ed24dda76d
gnu: CMake: Remove most bundled libraries.
* gnu/packages/cmake.scm (cmake-bootstrap)[source](modules): Add (ice-9 ftw).
[source](snippet): Change to a whitelist approach, keeping "jsoncpp" and "libuv".
[arguments]: Add phase "use-system-libarchive".  Remove substitution of deleted file.
[native-inputs]: Add (PACKAGE-SOURCE LIBARCHIVE)
[license]: Remove LICENSE:BSD-4 and LICENSE:BSD-2.
2020-01-25 14:44:53 +01:00
Marius Bakke
b5fc075d01
gnu: cmake-minimal: Remove bundled jsoncpp.
* gnu/packages/cmake.scm (cmake-minimal)[source](snippet): New field.  Purge
bundled jsoncpp.
[inputs]: Add JSONCPP.
[arguments]: Adjust accordingly.
* gnu/packages/serialization.scm (jsoncpp)[arguments]: For native builds, use
CMAKE-BOOTSTRAP.
2020-01-25 14:21:03 +01:00
Marius Bakke
7c1ea9316a
gnu: cmake-minimal-bootstrap: Rename to cmake-bootstrap.
...and change the inheritance order while at it, to prepare for the next commit.

* gnu/packages/cmake.scm (cmake-minimal): Rename to ...
(cmake-bootstrap): ... this.
[name]: Set to "cmake-bootstrap".
[native-inputs]: Change from CURL to CURL-MINIMAL.
(cmake-minimal-bootstrap): Remove variable.
(cmake-minimal): New variable, inherits from CMAKE-BOOTSTRAP.
* gnu/packages/image.scm (libjpeg-turbo)[arguments]: Change from
CMAKE-MINIMAL-BOOTSTRAP to CMAKE-BOOTSTRAP.
2020-01-25 14:19:14 +01:00
Marius Bakke
fa8e0a5387
gnu: cmake: Build an optimized executable.
* gnu/packages/cmake.scm (cmake-bootstrap)[arguments]: Pass
"-DCMAKE_BUILD_TYPE" in #:configure-flags.
2020-01-25 12:50:57 +01:00
Marius Bakke
ff5733d186
gnu: libjpeg-turbo: Build with a minimal variant of CMake.
This is necessary to avoid a circular dependency in the next commit.

* gnu/packages/curl.scm (curl-minimal): New public variable.
* gnu/packages/cmake.scm (cmake-minimal-bootstrap): New public variable.
* gnu/packages/image.scm (libjpeg-turbo)[arguments]: Add #:cmake.
2020-01-22 22:12:33 +01:00
Marius Bakke
848a3cdb4f
gnu: cmake: Update to 3.16.3.
* gnu/packages/cmake.scm (cmake-minimal): Update to 3.16.3.
2020-01-22 22:12:32 +01:00
Marius Bakke
3cfe76bec0
Merge branch 'master' into core-updates 2020-01-15 00:09:46 +01:00
Ludovic Courtès
79154f0a09
gnu: cmake@3.15.5: Honor 'SSL_CERT_DIR' and 'SSL_CERT_FILE'.
* gnu/packages/cmake.scm (cmake-3.15.5)[native-search-paths]: New field.
2020-01-12 00:19:09 +01:00
Ludovic Courtès
0de28f9ef9
gnu: cmake@3.15.5: Apply "cmake-curl-certificates.patch".
* gnu/packages/cmake.scm (cmake-3.15.5)[source]: Add 'patches' field.
(cmake/fixed): Turn into a deprecated alias for CMAKE-3.15.5.
2020-01-12 00:19:09 +01:00
Marius Bakke
9039f0b7b6
gnu: CMake: Update to 3.16.2.
* gnu/packages/cmake.scm (cmake-minimal): Update to 3.16.2.
2020-01-08 21:56:03 +01:00
Marius Bakke
47c4c1fe23
gnu: CMake: Update to 3.16.0.
* gnu/packages/cmake.scm (cmake-minimal): Update to 3.16.0.
[arguments]: Adjust for renamed file.  Disable test RunCMake.install.
* gnu/packages/patches/cmake-curl-certificates.patch: Adjust context.
2019-12-05 17:59:02 +01:00
Marius Bakke
a4de5cfd2f
gnu: Remove cmake/fixed.
* gnu/packages/cmake.scm (cmake/fixed): Remove variable.
(cmake-minimal)[source](patches): Add "cmake-curl-certificates.patch".
2019-12-05 17:59:02 +01:00
Mathieu Othacehe
154d97abdd
Merge remote-tracking branch master into core-updates 2019-11-16 09:34:27 +01:00
Ivan Vilata-i-Balaguer
528b52390d
gnu: CMake: Add version 3.15.5.
Add CMake version 3.15.5 but do not replace the existing version to avoid
triggering the rebuild of all CMake-based packages.

See <https://issues.guix.gnu.org/issue/38060>.

* gnu/packages/cmake.scm (cmake-3.15.5): Add CMake 3.15.5.

Signed-off-by: Marius Bakke <mbakke@fastmail.com>
2019-11-15 19:09:13 +01:00
Pierre-Moana Levesque
a8446b4029
gnu: cmake: Fix cross-compilation.
* gnu/packages/cmake.scm (cmake-minimal)[inputs]: Move all inputs to ...
[native-inputs]: ... here, except for ncurses.
2019-11-15 17:32:27 +01:00
Mathieu Othacehe
534537e2ef
gnu: cmake: Fix cross-compilation.
* gnu/packages/cmake.scm (cmake-minimal-cross): New package.
* guix/build-system/cmake.scm (default-cmake): Add new target argument and use
it to select cmake-minimal or cmake-minimal-cross.
(lower): Pass target to default-cmake.
2019-11-15 17:32:25 +01:00
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