From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maxim Cournoyer Subject: bug#33497: [PATCHv2] Re: bug#33497: Our CMake package has no documentation Date: Thu, 21 Mar 2019 22:19:29 -0400 Message-ID: <8736nfps5q.fsf@gmail.com> References: <8736rp649l.fsf@apteryx.i-did-not-set--mail-host-address--so-tickle-me> <87y39h4pfk.fsf@gmail.com> <878sykiwwq.fsf@fastmail.com> <87o96glvvm.fsf@gmail.com> <874l81a26n.fsf@fastmail.com> <875zsd7coj.fsf@gmail.com> <87va0d568n.fsf_-_@gmail.com> <87bm24840g.fsf@fastmail.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([209.51.188.92]:38686) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h79mu-0000W0-Dk for bug-guix@gnu.org; Thu, 21 Mar 2019 22:20:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h79ms-0003Ty-Of for bug-guix@gnu.org; Thu, 21 Mar 2019 22:20:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40331) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h79ms-0003Sq-Ao for bug-guix@gnu.org; Thu, 21 Mar 2019 22:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1h79ms-0006hI-0N for bug-guix@gnu.org; Thu, 21 Mar 2019 22:20:02 -0400 Sender: "Debbugs-submit" Resent-To: bug-guix@gnu.org Resent-Message-ID: In-Reply-To: <87bm24840g.fsf@fastmail.com> (Marius Bakke's message of "Thu, 21 Mar 2019 19:40:47 +0100") List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Marius Bakke Cc: 33497-done@debbugs.gnu.org Marius Bakke writes: > Maxim Cournoyer writes: > >> Here's an improved version, following some comments of Marius on #guix. >> >> From 2f33a7321e5e37d37f57c229c8079cb4ffd10834 Mon Sep 17 00:00:00 2001 >> From: Maxim Cournoyer >> Date: Wed, 20 Mar 2019 21:38:19 -0400 >> Subject: [PATCH] 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. > > Thanks! LGTM. Pushed to core-updates with commit 2f33a7321e. Thank you! Maxim