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 82A9F13835A for ; Tue, 6 Apr 2021 18:18:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3EE6E097D; Tue, 6 Apr 2021 18:18:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 6E171E097E for ; Tue, 6 Apr 2021 18:18:43 +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 47A1F335DBA for ; Tue, 6 Apr 2021 18:18:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3AB356EB for ; Tue, 6 Apr 2021 18:18:37 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1617733102.19c721a21a6fc795b72433229e5eb01b91b22de7.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/qt_gui_cpp/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2-r1.ebuild dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild X-VCS-Directories: dev-ros/qt_gui_cpp/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 19c721a21a6fc795b72433229e5eb01b91b22de7 X-VCS-Branch: master Date: Tue, 6 Apr 2021 18:18:37 +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: 38f069ee-78a9-4e7d-8d54-25c26d9feebb X-Archives-Hash: 736272533326c5ab45cc130fedb48b5d commit: 19c721a21a6fc795b72433229e5eb01b91b22de7 Author: Sam James gentoo org> AuthorDate: Tue Apr 6 02:47:08 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Apr 6 18:18:22 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19c721a2 dev-ros/qt_gui_cpp: move CMAKE_MAKEFILE_GENERATOR to pre-inherit Marked as @PRE_INHERIT within cmake.eclass because it manipulates dependencies in global scope. Signed-off-by: Sam James gentoo.org> dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2-r1.ebuild | 7 +++---- dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2-r1.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2-r1.ebuild index dac9e5563d6..84d56a89ba1 100644 --- a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2-r1.ebuild +++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,6 +7,8 @@ ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core" KEYWORDS="~amd64" ROS_SUBDIR=${PN} +# FIXME: fails to build with ninja +CMAKE_MAKEFILE_GENERATOR=emake inherit ros-catkin DESCRIPTION="C++-bindings for qt_gui and creates bindings for every generator available" @@ -32,6 +34,3 @@ PATCHES=( "${FILESDIR}/libdir.patch" "${FILESDIR}/rpaths.patch" ) - -# FIXME: fails to build with ninja -CMAKE_MAKEFILE_GENERATOR=emake diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild index dac9e5563d6..84d56a89ba1 100644 --- a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild +++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,6 +7,8 @@ ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core" KEYWORDS="~amd64" ROS_SUBDIR=${PN} +# FIXME: fails to build with ninja +CMAKE_MAKEFILE_GENERATOR=emake inherit ros-catkin DESCRIPTION="C++-bindings for qt_gui and creates bindings for every generator available" @@ -32,6 +34,3 @@ PATCHES=( "${FILESDIR}/libdir.patch" "${FILESDIR}/rpaths.patch" ) - -# FIXME: fails to build with ninja -CMAKE_MAKEFILE_GENERATOR=emake