Skip to content

Avoid compilation on jazzy or higher #301

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.

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions openvdb_vendor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ project(openvdb_vendor)
find_package(ament_cmake REQUIRED)
find_package(ament_cmake_vendor_package REQUIRED)

list(APPEND CMAKE_MODULE_PATH "/usr/lib/x86_64-linux-gnu/cmake/OpenVDB")
find_package(OpenVDB 10 QUIET)

ament_vendor(${PROJECT_NAME}
SATISFIED ${OpenVDB_FOUND}
VCS_URL https://github.com/AcademySoftwareFoundation/openvdb.git
VCS_VERSION v10.0.1
VCS_TYPE git
Expand Down
1 change: 1 addition & 0 deletions openvdb_vendor/openvdb_vendor-extras.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ if(NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "")
endif()
message( STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}" )
list(APPEND CMAKE_MODULE_PATH "${openvdb_vendor_DIR}/../../../opt/openvdb_vendor/lib/cmake/OpenVDB")
list(APPEND CMAKE_MODULE_PATH "/usr/lib/x86_64-linux-gnu/cmake/OpenVDB")
find_package(OpenVDB REQUIRED)
3 changes: 2 additions & 1 deletion openvdb_vendor/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model
href="http://download.ros.org/schema/package_format2.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="2">
<package format="3">
<name>openvdb_vendor</name>
<version>2.2.0</version>
<description>
Expand All @@ -26,6 +26,7 @@
<depend>libblosc-dev</depend>
<depend>libboost-iostreams-dev</depend>
<depend>libboost-thread-dev</depend>
<depend condition="$ROS_DISTRO != humble and $ROS_DISTRO != iron">libopenvdb-dev</depend>
<depend>tbb</depend>
<depend>zlib</depend>

Expand Down