Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sat, 04 Mar 2017 15:47:57
Message-Id: 1488642461.b3f2f902cde7ffefeaef47168d0ce7000a2fa13c.aballier@gentoo
1 commit: b3f2f902cde7ffefeaef47168d0ce7000a2fa13c
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Sat Mar 4 15:47:33 2017 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 4 15:47:41 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3f2f902
7
8 eclass/ros-catkin.eclass: Stop abusing CMAKE_PREFIX_PATH and use CATKIN_PREFIX_PATH now that we support that.
9
10 eclass/ros-catkin.eclass | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13 diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass
14 index b427e0861b8..b6b84a0dc5f 100644
15 --- a/eclass/ros-catkin.eclass
16 +++ b/eclass/ros-catkin.eclass
17 @@ -191,7 +191,7 @@ ros-catkin_src_configure_internal() {
18 # @DESCRIPTION:
19 # Configures a catkin-based package.
20 ros-catkin_src_configure() {
21 - export CMAKE_PREFIX_PATH="${EPREFIX}/usr"
22 + export CATKIN_PREFIX_PATH="${EPREFIX}/usr"
23 export ROS_ROOT="${EPREFIX}/usr/share/ros"
24 if [ -n "${CATKIN_HAS_MESSAGES}" ] ; then
25 ROS_LANG_DISABLE=""