gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-06 00:48:18 -07:00
Code Issues Projects Releases Wiki Activity

dev-ros/urg_node: move CMAKE_MAKEFILE_GENERATOR to pre-inherit

Browse Source 
Marked as @PRE_INHERIT within cmake.eclass because it manipulates
dependencies in global scope.

Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2021-04-06 03:49:05 +01:00
parent 8451a3df3f
commit d7ec0073ba
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dev-ros/urg_node/urg_node-0.1.15.ebuild
View File

@@ -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

7
dev-ros/urg_node/urg_node-9999.ebuild
View File

@@ -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