[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#70031] [core-updates PATCH 03/19] build-system/cmake: Add build.
From: |
Greg Hogan |
Subject: |
[bug#70031] [core-updates PATCH 03/19] build-system/cmake: Add build. |
Date: |
Wed, 27 Mar 2024 14:52:28 +0000 |
* guix/build/cmake-build-system.scm (build): New function to replace
the make build with the cmake build command.
---
guix/build/cmake-build-system.scm | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/guix/build/cmake-build-system.scm
b/guix/build/cmake-build-system.scm
index 1775f7a7509..8f1c80aeb64 100644
--- a/guix/build/cmake-build-system.scm
+++ b/guix/build/cmake-build-system.scm
@@ -81,6 +81,14 @@ (define* (configure #:key outputs (configure-flags '())
(out-of-source? #t)
(format #t "running 'cmake' with arguments ~s~%" args)
(apply invoke "cmake" args))))
+(define* (build #:key (parallel-build? #t) #:allow-other-keys)
+ (apply invoke "cmake"
+ `("--build"
+ "."
+ ,@(if parallel-build?
+ `("-j" ,(number->string (parallel-job-count)))
+ '()))))
+
(define %test-suite-log-regexp
;; Name of test suite log files as commonly found in CMake.
"^LastTestFailed\\.log$")
@@ -102,10 +110,9 @@ (define* (check #:key (tests? #t) (parallel-tests? #t)
(format #t "test suite not run~%")))
(define %standard-phases
- ;; Everything is as with the GNU Build System except for the `configure'
- ;; and 'check' phases.
(modify-phases gnu:%standard-phases
(delete 'bootstrap)
+ (replace 'build build)
(replace 'check check)
(replace 'configure configure)))
--
2.44.0
- [bug#70031] [core-updates PATCH 00/19] Use CMake in build-system/cmake., Greg Hogan, 2024/03/27
- [bug#70031] [core-updates PATCH 03/19] build-system/cmake: Add build.,
Greg Hogan <=
- [bug#70031] [core-updates PATCH 01/19] build-system/cmake: Parallelize tests using ctest., Greg Hogan, 2024/03/27
- [bug#70031] [core-updates PATCH 04/19] build-system/cmake: Add install., Greg Hogan, 2024/03/27
- [bug#70031] [core-updates PATCH 05/19] gnu: libmedfile: Disable parallel tests., Greg Hogan, 2024/03/27
- [bug#70031] [core-updates PATCH 07/19] gnu: fish: Fix tests., Greg Hogan, 2024/03/27
- [bug#70031] [core-updates PATCH 09/19] gnu: igraph: Move test target to check phase., Greg Hogan, 2024/03/27
- [bug#70031] [core-updates PATCH 02/19] build-system/cmake: Parameterize build system generator., Greg Hogan, 2024/03/27
- [bug#70031] [core-updates PATCH 06/19] gnu: srt: Disable parallel tests., Greg Hogan, 2024/03/27
- [bug#70031] [core-updates PATCH 10/19] gnu: inkscape: Move test target to check phase., Greg Hogan, 2024/03/27
- [bug#70031] [core-updates PATCH 11/19] gnu: vigra: Move test target to check phase., Greg Hogan, 2024/03/27
- [bug#70031] [core-updates PATCH 15/19] gnu: websocketpp: Disable parallel tests., Greg Hogan, 2024/03/27