From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DF3441384B4 for ; Thu, 19 Nov 2015 09:58:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 967BDE0874; Thu, 19 Nov 2015 09:58:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1538DE086C for ; Thu, 19 Nov 2015 09:58:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 137AF340A0E for ; Thu, 19 Nov 2015 09:58:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D39C6ABE for ; Thu, 19 Nov 2015 09:58:44 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1447927119.0f076db9febbc02a17a61dac7ece0c7c16493746.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/catkin/files/catkin_prefix_path.patch X-VCS-Directories: dev-util/catkin/files/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 0f076db9febbc02a17a61dac7ece0c7c16493746 X-VCS-Branch: master Date: Thu, 19 Nov 2015 09:58:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6ddf9682-52c8-4587-8d8d-6445664a76fe X-Archives-Hash: 7c38b89fa078139322e2ef04f8778572 commit: 0f076db9febbc02a17a61dac7ece0c7c16493746 Author: Alexis Ballier gentoo org> AuthorDate: Thu Nov 19 09:54:45 2015 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Thu Nov 19 09:58:39 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f076db9 dev-util/catkin: Honour CATKIN_PREFIX_PATH in toplevel.cmake too. Bug #566094. Package-Manager: portage-2.2.25 Signed-off-by: Alexis Ballier gentoo.org> dev-util/catkin/files/catkin_prefix_path.patch | 39 ++++++++++++++++++++------ 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/dev-util/catkin/files/catkin_prefix_path.patch b/dev-util/catkin/files/catkin_prefix_path.patch index 94e23ee..5c03a45 100644 --- a/dev-util/catkin/files/catkin_prefix_path.patch +++ b/dev-util/catkin/files/catkin_prefix_path.patch @@ -7,10 +7,10 @@ ROS packages are properly configured without needed to source a shellrc file in every shell session. This can't be done with CMAKE_PREFIX_PATH which is way too generic. -Index: catkin-0.6.9/cmake/all.cmake +Index: catkin-0.6.16/cmake/all.cmake =================================================================== ---- catkin-0.6.9.orig/cmake/all.cmake -+++ catkin-0.6.9/cmake/all.cmake +--- catkin-0.6.16.orig/cmake/all.cmake ++++ catkin-0.6.16/cmake/all.cmake @@ -52,7 +52,11 @@ set(CMAKE_PREFIX_PATH_AS_IS ${CMAKE_PREF # list of unique catkin workspaces based on CMAKE_PREFIX_PATH @@ -24,10 +24,10 @@ Index: catkin-0.6.9/cmake/all.cmake if(EXISTS "${path}/.catkin") list(FIND CATKIN_WORKSPACES ${path} _index) if(_index EQUAL -1) -Index: catkin-0.6.11/python/catkin/workspace.py +Index: catkin-0.6.16/python/catkin/workspace.py =================================================================== ---- catkin-0.6.11.orig/python/catkin/workspace.py -+++ catkin-0.6.11/python/catkin/workspace.py +--- catkin-0.6.16.orig/python/catkin/workspace.py ++++ catkin-0.6.16/python/catkin/workspace.py @@ -44,7 +44,7 @@ def get_workspaces(): """ # get all cmake prefix paths @@ -37,10 +37,10 @@ Index: catkin-0.6.11/python/catkin/workspace.py # remove non-workspace paths workspaces = [path for path in paths if os.path.isfile(os.path.join(path, CATKIN_MARKER_FILE))] return workspaces -Index: catkin-0.6.9/cmake/catkinConfig.cmake.in +Index: catkin-0.6.16/cmake/catkinConfig.cmake.in =================================================================== ---- catkin-0.6.9.orig/cmake/catkinConfig.cmake.in -+++ catkin-0.6.9/cmake/catkinConfig.cmake.in +--- catkin-0.6.16.orig/cmake/catkinConfig.cmake.in ++++ catkin-0.6.16/cmake/catkinConfig.cmake.in @@ -64,6 +64,11 @@ if(catkin_FIND_COMPONENTS) # get search paths from CMAKE_PREFIX_PATH (which includes devel space) @@ -53,3 +53,24 @@ Index: catkin-0.6.9/cmake/catkinConfig.cmake.in foreach(path ${CMAKE_PREFIX_PATH}) if(IS_DIRECTORY ${path}/share/${component}/cmake) list(APPEND paths ${path}/share/${component}/cmake) +Index: catkin-0.6.16/cmake/toplevel.cmake +=================================================================== +--- catkin-0.6.16.orig/cmake/toplevel.cmake ++++ catkin-0.6.16/cmake/toplevel.cmake +@@ -35,10 +35,15 @@ else() + string(REPLACE ":" ";" CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH}) + endif() + endif() ++ if(NOT DEFINED CATKIN_PREFIX_PATH) ++ if(NOT "$ENV{CATKIN_PREFIX_PATH}" STREQUAL "") ++ string(REPLACE ":" ";" CATKIN_PREFIX_PATH $ENV{CATKIN_PREFIX_PATH}) ++ endif() ++ endif() + + # list of catkin workspaces + set(catkin_search_path "") +- foreach(path ${CMAKE_PREFIX_PATH}) ++ foreach(path ${CMAKE_PREFIX_PATH} ${CATKIN_PREFIX_PATH}) + if(EXISTS "${path}/.catkin") + list(FIND catkin_search_path ${path} _index) + if(_index EQUAL -1)