From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Subject: Re: [gentoo-dev] [PATCH 07/15] cmake-utils.eclass: replace replace comment_add_subdirectory with a namespaced version
Date: Thu, 21 Jan 2016 17:29:58 +0100 [thread overview]
Message-ID: <DB667B2D-9513-4E57-A7C1-942D3FF9AEE9@gentoo.org> (raw)
In-Reply-To: <1453286593-26823-8-git-send-email-kensington@gentoo.org>
Dnia 20 stycznia 2016 11:43:05 CET, Michael Palimaka <kensington@gentoo.org> napisał(a):
>---
> eclass/cmake-utils.eclass | 15 +++++++++++++--
> 1 file changed, 13 insertions(+), 2 deletions(-)
>
>diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
>index 1de863f..e8b24bd 100644
>--- a/eclass/cmake-utils.eclass
>+++ b/eclass/cmake-utils.eclass
>@@ -250,11 +250,11 @@ _generator_to_use() {
> echo ${generator_name}
> }
>
>-# @FUNCTION: comment_add_subdirectory
>+# @FUNCTION: cmake_comment_add_subdirectory
> # @USAGE: <subdirectory>
> # @DESCRIPTION:
># Comment out an add_subdirectory call in CMakeLists.txt in the current
>directory
>-comment_add_subdirectory() {
>+cmake_comment_add_subdirectory() {
> if [[ -z ${1} ]]; then
>die "comment_add_subdirectory must be passed the directory name to
>comment"
> fi
>@@ -265,6 +265,17 @@ comment_add_subdirectory() {
> fi
> }
>
>+# @FUNCTION: comment_add_subdirectory
>+# @USAGE: <subdirectory>
>+# @DESCRIPTION:
>+# Comment out an add_subdirectory call in CMakeLists.txt in the
>current directory
>+# Banned in EAPI 6 and later - use cmake_comment_add_subdirectory
>instead.
>+comment_add_subdirectory() {
>+ has "${EAPI:-0}" 2 3 4 5 || die "comment_add_subdirectory is banned
>in EAPI 6 and later - use cmake_comment_add_subdirectory instead"
>+
>+ cmake_comment_add_subdirectory "$@"
>+}
>+
> # @FUNCTION: cmake-utils_use_with
> # @USAGE: <USE flag> [flag name]
> # @DESCRIPTION:
Enough to 'replace' once :-P (commit message).
--
Best regards,
Michał Górny (by phone)
next prev parent reply other threads:[~2016-01-21 16:30 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-20 10:42 [gentoo-dev] [PATCH 00/15] EAPI 6 support for cmake-utils.eclas Michael Palimaka
2016-01-20 10:42 ` [gentoo-dev] [PATCH 01/15] cmake-utils.eclass: reorder a bit Michael Palimaka
2016-01-20 10:43 ` [gentoo-dev] [PATCH 02/15] cmake-utils.eclass: declare some variables local Michael Palimaka
2016-01-20 10:43 ` [gentoo-dev] [PATCH 03/15] cmake-utils.eclass: check exit codes of executed commands Michael Palimaka
2016-01-20 10:43 ` [gentoo-dev] [PATCH 04/15] cmake-utils.eclass: use a proper if statement Michael Palimaka
2016-01-20 10:43 ` [gentoo-dev] [PATCH 05/15] cmake-utils.eclass: remove duplicate CMAKE_REMOVE_MODULES Michael Palimaka
2016-01-20 10:43 ` [gentoo-dev] [PATCH 06/15] cmake-utils.eclass: ban WANT_CMAKE in EAPI 6 and later Michael Palimaka
2016-01-20 10:43 ` [gentoo-dev] [PATCH 07/15] cmake-utils.eclass: replace replace comment_add_subdirectory with a namespaced version Michael Palimaka
2016-01-21 16:29 ` Michał Górny [this message]
2016-01-22 9:36 ` [gentoo-dev] " Michael Palimaka
2016-01-20 10:43 ` [gentoo-dev] [PATCH 08/15] cmake-utils.eclass: namespace some private functions Michael Palimaka
2016-01-20 10:43 ` [gentoo-dev] [PATCH 09/15] cmake-utils.eclass: move $S modifications to src_prepare in EAPI 6 and later Michael Palimaka
2016-01-20 10:43 ` [gentoo-dev] [PATCH 10/15] cmake-utils.eclass: ban non-array usage of mycmakeargs " Michael Palimaka
2016-01-20 10:43 ` [gentoo-dev] [PATCH 11/15] cmake-utils.eclass: use default_src_prepare " Michael Palimaka
2016-01-20 10:43 ` [gentoo-dev] [PATCH 12/15] cmake-utils.eclass: require two arguments for cmake-utils_use_find_package " Michael Palimaka
2016-01-20 10:43 ` [gentoo-dev] [PATCH 13/15] cmake-utils.eclass: ban helper functions " Michael Palimaka
2016-01-21 16:31 ` Michał Górny
2016-01-22 9:36 ` [gentoo-dev] " Michael Palimaka
2016-01-20 10:43 ` [gentoo-dev] [PATCH 14/15] cmake-utils.eclass: enable EAPI 6 Michael Palimaka
2016-01-20 10:43 ` [gentoo-dev] [PATCH 15/15] cmake-utils.eclass: update copyright year Michael Palimaka
2016-01-21 16:32 ` Michał Górny
2016-01-22 9:34 ` [gentoo-dev] " Michael Palimaka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=DB667B2D-9513-4E57-A7C1-942D3FF9AEE9@gentoo.org \
--to=mgorny@gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox