diff options
| author |   Sam James <sam@gentoo.org> | 2021-04-06 03:49:05 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-04-06 19:18:25 +0100 |
| commit | d7ec0073babe92e009f018d45b40eb3940ae351b (patch) | |
| tree | 27251c1a41aeb55d209203e7a57e66a1c3fd8f62 /dev-ros | |
| parent | dev-ros/roslint: move CMAKE_MAKEFILE_GENERATOR to pre-inherit (diff) | |
| download | gentoo-d7ec0073babe92e009f018d45b40eb3940ae351b.tar.gz gentoo-d7ec0073babe92e009f018d45b40eb3940ae351b.tar.bz2 gentoo-d7ec0073babe92e009f018d45b40eb3940ae351b.zip | |
dev-ros/urg_node: 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/urg_node/urg_node-0.1.15.ebuild | 5 | ||||
| -rw-r--r-- | dev-ros/urg_node/urg_node-9999.ebuild | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/dev-ros/urg_node/urg_node-0.1.15.ebuild b/dev-ros/urg_node/urg_node-0.1.15.ebuild index 985c4cbd04ca..0b173d1c9c2f 100644 --- a/dev-ros/urg_node/urg_node-0.1.15.ebuild +++ b/dev-ros/urg_node/urg_node-0.1.15.ebuild @@ -6,6 +6,8 @@ ROS_REPO_URI="https://github.com/ros-drivers/urg_node" KEYWORDS="~amd64 ~arm" CATKIN_HAS_MESSAGES=yes +# https://bugs.gentoo.org/735106 +CMAKE_MAKEFILE_GENERATOR=emake inherit ros-catkin DESCRIPTION="ROS wrapper for the Hokuyo urg_c library" @@ -32,6 +34,3 @@ DEPEND="${RDEPEND} dev-ros/roslaunch ) " - -# https://bugs.gentoo.org/735106 -CMAKE_MAKEFILE_GENERATOR=emake diff --git a/dev-ros/urg_node/urg_node-9999.ebuild b/dev-ros/urg_node/urg_node-9999.ebuild index cd680c30f62e..0b173d1c9c2f 100644 --- a/dev-ros/urg_node/urg_node-9999.ebuild +++ b/dev-ros/urg_node/urg_node-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 @@ -6,6 +6,8 @@ ROS_REPO_URI="https://github.com/ros-drivers/urg_node" KEYWORDS="~amd64 ~arm" CATKIN_HAS_MESSAGES=yes +# https://bugs.gentoo.org/735106 +CMAKE_MAKEFILE_GENERATOR=emake inherit ros-catkin DESCRIPTION="ROS wrapper for the Hokuyo urg_c library" @@ -32,6 +34,3 @@ DEPEND="${RDEPEND} dev-ros/roslaunch ) " - -# https://bugs.gentoo.org/735106 -CMAKE_MAKEFILE_GENERATOR=emake |