summaryrefslogtreecommitdiff
path: root/dev-ros/pluginlib/files/catkin_prefix_path2.patch
diff options
context:
space:
mode:
Diffstat (limited to 'dev-ros/pluginlib/files/catkin_prefix_path2.patch')
-rw-r--r--dev-ros/pluginlib/files/catkin_prefix_path2.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/dev-ros/pluginlib/files/catkin_prefix_path2.patch b/dev-ros/pluginlib/files/catkin_prefix_path2.patch
new file mode 100644
index 000000000000..12e759c63216
--- /dev/null
+++ b/dev-ros/pluginlib/files/catkin_prefix_path2.patch
@@ -0,0 +1,15 @@
+Honour CATKIN_PREFIX_PATH at runtime instead of ROS' hack to use CMAKE_PREFIX_PATH.
+
+Index: pluginlib-1.11.2/include/pluginlib/class_loader_imp.hpp
+===================================================================
+--- pluginlib-1.11.2.orig/include/pluginlib/class_loader_imp.hpp
++++ pluginlib-1.11.2/include/pluginlib/class_loader_imp.hpp
+@@ -68,7 +68,7 @@ namespace
+ std::vector<std::string> catkinFindLib()
+ {
+ std::vector<std::string> lib_paths;
+- const char * env = std::getenv("CMAKE_PREFIX_PATH");
++ const char * env = std::getenv("CATKIN_PREFIX_PATH");
+ if (env) {
+ std::string env_catkin_prefix_paths(env);
+ std::vector<std::string> catkin_prefix_paths;