From 9849cfc12cada96759af779a105f6999d6cc04c8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 4 Oct 2014 22:59:38 +0200 Subject: build-system/cmake: Add #:build-type parameter, default to "RelWithDebInfo". * guix/build-system/cmake.scm (cmake-build): Add #:build-type. Pass it in BUILDER. * guix/build/cmake-build-system.scm (configure): Add #:build-type parameter and honor it. * doc/guix.texi (Build Systems): Document #:configure-flags and #:build-type for CMake. --- guix/build/cmake-build-system.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'guix/build') diff --git a/guix/build/cmake-build-system.scm b/guix/build/cmake-build-system.scm index 7d60ab7aa9..74b4f01425 100644 --- a/guix/build/cmake-build-system.scm +++ b/guix/build/cmake-build-system.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Ludovic Courtès +;;; Copyright © 2013, 2014 Ludovic Courtès ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2014 Andreas Enge ;;; @@ -32,6 +32,7 @@ (define-module (guix build cmake-build-system) ;; Code: (define* (configure #:key outputs (configure-flags '()) (out-of-source? #t) + build-type #:allow-other-keys) "Configure the given package." (let* ((out (assoc-ref outputs "out")) @@ -47,6 +48,10 @@ (define* (configure #:key outputs (configure-flags '()) (out-of-source? #t) (format #t "build directory: ~s~%" (getcwd)) (let ((args `(,srcdir + ,@(if build-type + (list (string-append "-DCMAKE_BUILD_TYPE=" + build-type)) + '()) ,(string-append "-DCMAKE_INSTALL_PREFIX=" out) ;; add input libraries to rpath "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE" -- cgit v1.2.3