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

SearchForStuff: add logic to find urdfdom without pkg-config #245

Merged
merged 1 commit into from
Sep 7, 2020
Merged

SearchForStuff: add logic to find urdfdom without pkg-config #245

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
8 changes: 7 additions & 1 deletion cmake/SearchForStuff.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,13 @@ if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF)
pkg_check_modules(URDF urdfdom>=1.0)

if (NOT URDF_FOUND)
if (NOT DEFINED USE_INTERNAL_URDF)
find_package(urdfdom)
if (urdfdom_FOUND)
set(URDF_INCLUDE_DIRS ${urdfdom_INCLUDE_DIRS})
# ${urdfdom_LIBRARIES} already contains absolute library filenames
set(URDF_LIBRARY_DIRS "")
set(URDF_LIBRARIES ${urdfdom_LIBRARIES})
elseif (NOT DEFINED USE_INTERNAL_URDF)
message(STATUS "Couldn't find urdfdom >= 1.0, using internal copy")
set(USE_INTERNAL_URDF true)
else()
Expand Down