diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
| commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
| tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /eclass/ros-catkin.eclass | |
| parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) | |
gentoo resync : 28.04.2021
Diffstat (limited to 'eclass/ros-catkin.eclass')
| -rw-r--r-- | eclass/ros-catkin.eclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass index 2779a0353ecb..1bd1be4a478c 100644 --- a/eclass/ros-catkin.eclass +++ b/eclass/ros-catkin.eclass @@ -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 # @ECLASS: ros-catkin.eclass @@ -61,11 +61,13 @@ DEPEND="${RDEPEND} " # @ECLASS-VARIABLE: CATKIN_HAS_MESSAGES +# @PRE_INHERIT # @DESCRIPTION: # Set it to a non-empty value before inherit to tell the eclass the package has messages to build. # Messages will be built based on ROS_MESSAGES USE_EXPANDed variable. # @ECLASS-VARIABLE: CATKIN_MESSAGES_TRANSITIVE_DEPS +# @PRE_INHERIT # @DESCRIPTION: # Some messages have dependencies on other messages. # In that case, CATKIN_MESSAGES_TRANSITIVE_DEPS should contain a space-separated list of atoms @@ -175,7 +177,7 @@ ros-catkin_src_configure() { local mycmakeargs=( "-DCATKIN_ENABLE_TESTING=$(usex test)" "-DCATKIN_BUILD_BINARY_PACKAGE=ON" - "-DCATKIN_PREFIX_PATH=${SYSROOT:-${EROOT}}/usr" + "-DCATKIN_PREFIX_PATH=${SYSROOT:-${EPREFIX}}/usr" "${mycatkincmakeargs[@]}" ) |