[catkin] 03/03: Add patch to let find_package search in default pathes
Jochen Sprickerhof
jspricke-guest at moszumanska.debian.org
Tue Dec 9 00:11:02 UTC 2014
This is an automated email from the git hooks/post-receive script.
jspricke-guest pushed a commit to branch master
in repository catkin.
commit a46008c8b955117ca0bd9f10317a2e439e3a5f56
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Tue Dec 9 01:10:33 2014 +0100
Add patch to let find_package search in default pathes
---
...EFAULT_PATH-and-NO_CMAKE_FIND_ROOT_PATH-f.patch | 31 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 32 insertions(+)
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
new file mode 100644
index 0000000..c21c433
--- /dev/null
+++ b/debian/patches/0001-Remove-NO_DEFAULT_PATH-and-NO_CMAKE_FIND_ROOT_PATH-f.patch
@@ -0,0 +1,31 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Tue, 9 Dec 2014 01:00:22 +0100
+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(-)
+
+diff --git a/cmake/catkinConfig.cmake.in b/cmake/catkinConfig.cmake.in
+index 2183ce8..c222f7b 100644
+--- a/cmake/catkinConfig.cmake.in
++++ b/cmake/catkinConfig.cmake.in
+@@ -72,14 +72,12 @@ if(catkin_FIND_COMPONENTS)
+
+ # find package component
+ if(catkin_FIND_REQUIRED)
+- find_package(${component} REQUIRED NO_MODULE PATHS ${paths}
+- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++ find_package(${component} REQUIRED NO_MODULE PATHS ${paths})
++
+ elseif(catkin_FIND_QUIETLY)
+- find_package(${component} QUIET NO_MODULE PATHS ${paths}
+- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++ find_package(${component} QUIET NO_MODULE PATHS ${paths})
+ else()
+- find_package(${component} NO_MODULE PATHS ${paths}
+- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
++ find_package(${component} NO_MODULE PATHS ${paths})
+ endif()
+
+ # append component-specific variables to catkin_* variables
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c88de52
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Remove-NO_DEFAULT_PATH-and-NO_CMAKE_FIND_ROOT_PATH-f.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/catkin.git
More information about the debian-science-commits
mailing list