[catkin] 01/01: Update NO_DEFAULT_PATH patch

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke-guest pushed a commit to branch master
in repository catkin.

commit 1486d261569e124636af087b704d799632e2ad6f
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sat Feb 7 00:44:51 2015 +0100

    Update NO_DEFAULT_PATH patch
---
 ...-NO_DEFAULT_PATH-and-NO_CMAKE_FIND_ROOT_PATH-f.patch | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/debian/patches/0001-Remove-NO_DEFAULT_PATH-and-NO_CMAKE_FIND_ROOT_PATH-f.patch b/debian/patches/0001-Remove-NO_DEFAULT_PATH-and-NO_CMAKE_FIND_ROOT_PATH-f.patch
index c21c433..44fdb9e 100644
--- a/debian/patches/0001-Remove-NO_DEFAULT_PATH-and-NO_CMAKE_FIND_ROOT_PATH-f.patch
+++ b/debian/patches/0001-Remove-NO_DEFAULT_PATH-and-NO_CMAKE_FIND_ROOT_PATH-f.patch
@@ -4,7 +4,8 @@ Subject: Remove NO_DEFAULT_PATH and NO_CMAKE_FIND_ROOT_PATH from find_package
 
 ---
  cmake/catkinConfig.cmake.in | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
+ cmake/toplevel.cmake        |  3 +--
+ 2 files changed, 5 insertions(+), 8 deletions(-)
 
 diff --git a/cmake/catkinConfig.cmake.in b/cmake/catkinConfig.cmake.in
 index 2183ce8..c222f7b 100644
@@ -29,3 +30,17 @@ index 2183ce8..c222f7b 100644
        endif()
  
        # append component-specific variables to catkin_* variables
+diff --git a/cmake/toplevel.cmake b/cmake/toplevel.cmake
+index 2978ef0..128f594 100644
+--- a/cmake/toplevel.cmake
++++ b/cmake/toplevel.cmake
+@@ -51,8 +51,7 @@ else()
+   set(CATKIN_TOPLEVEL_FIND_PACKAGE TRUE)
+   find_package(catkin QUIET
+     NO_POLICY_SCOPE
+-    PATHS ${catkin_search_path}
+-    NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++    PATHS ${catkin_search_path})
+   unset(CATKIN_TOPLEVEL_FIND_PACKAGE)
+ 
+   if(NOT catkin_FOUND)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/catkin.git