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 E3ED3139085 for ; Sun, 18 Dec 2016 19:01:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3451B21C08E; Sun, 18 Dec 2016 19:01:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 11DF721C08E for ; Sun, 18 Dec 2016 19:01:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E077E340EDA for ; Sun, 18 Dec 2016 19:01:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ACD1391A for ; Sun, 18 Dec 2016 19:01:51 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1482087684.f77d785fe15870c92e704668d47c6966476c6827.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5.eclass X-VCS-Directories: eclass/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: f77d785fe15870c92e704668d47c6966476c6827 X-VCS-Branch: master Date: Sun, 18 Dec 2016 19:01:51 +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-Archives-Salt: aeb20599-dc65-4819-8264-12c0836489bd X-Archives-Hash: 2c358fae334437d2d5282b427a3ae633 commit: f77d785fe15870c92e704668d47c6966476c6827 Author: Johannes Huber gentoo org> AuthorDate: Sun Dec 18 19:01:24 2016 +0000 Commit: Johannes Huber gentoo org> CommitDate: Sun Dec 18 19:01:24 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f77d785f kde5.eclass: Sync with gentoo main tree eclass/kde5.eclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 3669536..ebdd790 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -773,7 +773,9 @@ _l10n_variant_subdir_buster() { esac for subdir in $(find ${dir} -mindepth 1 -maxdepth 1 -type d | sed -e "s:^\./::"); do - echo "add_subdirectory(${subdir##*/})" >> ${dir}/CMakeLists.txt + if [[ ${subdir##*/} != "cmake_modules" ]] ; then + echo "add_subdirectory(${subdir##*/})" >> ${dir}/CMakeLists.txt || die + fi done }