summaryrefslogtreecommitdiff
blob: f5a19ec6d42b93044a6f75771fff3950f872a717 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
Honour CATKIN_PREFIX_PATH at runtime instead of ROS' hack to use CMAKE_PREFIX_PATH.

Index: pluginlib-1.11.1/include/pluginlib/class_loader_imp.h
===================================================================
--- pluginlib-1.11.1.orig/include/pluginlib/class_loader_imp.h
+++ pluginlib-1.11.1/include/pluginlib/class_loader_imp.h
@@ -66,7 +66,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;