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

If vendored assimp is present, always prefer that #970

Merged
merged 2 commits into from
Apr 18, 2023
Merged

If vendored assimp is present, always prefer that #970

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d0c631
If vendored assimp is present, always prefer that
cottsay Apr 14, 2023
1e759bc
Update comment
cottsay Apr 17, 2023
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
12 changes: 5 additions & 7 deletions rviz_assimp_vendor/rviz_assimp_vendor-extras.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@
# https://bugs.launchpad.net/ubuntu/+source/assimp/+bug/1869405
set(ON 1)

find_package(assimp QUIET)

if(NOT assimp_FOUND OR "${assimp_VERSION}" VERSION_LESS 4.1.0)
# add the local Modules directory to the modules path
set(assimp_DIR "${@PROJECT_NAME@_DIR}/../../../opt/rviz_assimp_vendor/lib/cmake/assimp-4.1")
message(STATUS "Setting assimp_DIR to: '${assimp_DIR}'")
endif()
# We always add the local Modules directory to the modules path, so if a vendored package was
# built, it is used. If it was not built, find_package() will fall back to attempting to find the
# system package.
set(assimp_DIR "${@PROJECT_NAME@_DIR}/../../../opt/rviz_assimp_vendor/lib/cmake/assimp-4.1")
message(STATUS "Setting assimp_DIR to: '${assimp_DIR}'")

find_package(assimp REQUIRED QUIET)

Expand Down