From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C1FB513835A for ; Sun, 21 Feb 2021 12:33:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E746EE07DB; Sun, 21 Feb 2021 12:33:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CDD46E07DB for ; Sun, 21 Feb 2021 12:33:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6879B341011 for ; Sun, 21 Feb 2021 12:33:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B900C4E9 for ; Sun, 21 Feb 2021 12:33:27 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1613910781.47658a3692438894c64329fcfd33ae25ebe4ad74.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/cmake.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 47658a3692438894c64329fcfd33ae25ebe4ad74 X-VCS-Branch: master Date: Sun, 21 Feb 2021 12:33:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7bb57abc-83a1-4bea-a30b-01ba08f45e75 X-Archives-Hash: 6a600f3fde31544581d5ac97de140e22 commit: 47658a3692438894c64329fcfd33ae25ebe4ad74 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 21 12:30:54 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 21 12:33:01 2021 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=47658a36 cmake.eclass: Merge mycmakeargs description into cmake_src_configure() Makes it a part of cmake_src_configure() rather than oddly appearing under FUNCTIONS. Bug: https://bugs.gentoo.org/771876 Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/cmake.eclass | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index 5bead99f6f..8bf9be8271 100644 --- a/eclass/cmake.eclass +++ b/eclass/cmake.eclass @@ -364,25 +364,20 @@ cmake_src_prepare() { _CMAKE_SRC_PREPARE_HAS_RUN=1 } -# @VARIABLE: mycmakeargs -# @DEFAULT_UNSET +# @FUNCTION: cmake_src_configure # @DESCRIPTION: -# Optional cmake defines as a bash array. Should be defined before calling -# cmake_src_configure. +# General function for configuring with cmake. Default behaviour is to start an +# out-of-source build. +# Passes arguments to cmake by reading from an optionally pre-defined local +# mycmakeargs bash array. # @CODE # src_configure() { # local mycmakeargs=( # $(cmake_use_find_package foo LibFoo) # ) -# # cmake_src_configure # } # @CODE - -# @FUNCTION: cmake_src_configure -# @DESCRIPTION: -# General function for configuring with cmake. Default behaviour is to start an -# out-of-source build. cmake_src_configure() { debug-print-function ${FUNCNAME} "$@"