Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix getCatkinLibraryPaths on 64bit #177

Open
wants to merge 1 commit into
base: melodic-devel
Choose a base branch
from
Open

fix getCatkinLibraryPaths on 64bit #177

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion pluginlib/include/pluginlib/class_loader_imp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
#include "boost/bind.hpp"
#include "boost/filesystem.hpp"
#include "boost/foreach.hpp"
#include "boost/predef/architecture.h"
#include "class_loader/class_loader.hpp"

#include "ros/package.h"
Expand All @@ -63,6 +64,13 @@ const std::string os_pathsep(";"); // NOLINT
const std::string os_pathsep(":"); // NOLINT
#endif

#if BOOST_ARCH_ARM == BOOST_VERSION_NUMBER(8, 0, 0) \
|| defined(BOOST_ARCH_X86_64)
#define PLUGINLIB_ARCH_BITS 64
#else
#define PLUGINLIB_ARCH_BITS 32
#endif

namespace pluginlib
{
template<class T>
Expand Down Expand Up @@ -323,7 +331,11 @@ std::vector<std::string> ClassLoader<T>::getCatkinLibraryPaths()
boost::filesystem::path bin("bin");
lib_paths.push_back((path / bin).string());
#endif
boost::filesystem::path lib("lib");
boost::filesystem::path lib;
if (PLUGINLIB_ARCH_BITS == 64)
lib = "lib64";
else
lib = "lib";
lib_paths.push_back((path / lib).string());
}
}
Expand Down