diff options
| author |   Sam James <sam@gentoo.org> | 2021-04-06 03:47:08 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-04-06 19:18:22 +0100 |
| commit | 19c721a21a6fc795b72433229e5eb01b91b22de7 (patch) | |
| tree | 73787e2f867f06ab565cbbedfb3e4e1062871ce0 /dev-ros | |
| parent | net-fs/openafs: move MODULES_OPTIONAL_USE to pre-inherit (diff) | |
| download | gentoo-19c721a21a6fc795b72433229e5eb01b91b22de7.tar.gz gentoo-19c721a21a6fc795b72433229e5eb01b91b22de7.tar.bz2 gentoo-19c721a21a6fc795b72433229e5eb01b91b22de7.zip | |
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 <sam@gentoo.org>
Diffstat (limited to 'dev-ros')
| -rw-r--r-- | dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2-r1.ebuild | 7 | ||||
| -rw-r--r-- | 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 dac9e5563d61..84d56a89ba1f 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 dac9e5563d61..84d56a89ba1f 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 |