Skip to content

Commit fe7d918

Browse files
RaymanSteveMacenski
authored andcommitted
Avoid compilation on jazzy or higher (#301)
On jazzy the released openvdb version is already 10.0.1, so we don't have to compile the vendor package. Compilation on the build farm was already quite flakey because the package is quite heavy, so I'd be best to avoid this. I don't know if openvdb is also released for ARM or any other ubuntu platforms, but we'll have to see on the buildfarm.
1 parent 0a7d651 commit fe7d918

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

openvdb_vendor/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ project(openvdb_vendor)
44
find_package(ament_cmake REQUIRED)
55
find_package(ament_cmake_vendor_package REQUIRED)
66

7+
list(APPEND CMAKE_MODULE_PATH "/usr/lib/x86_64-linux-gnu/cmake/OpenVDB")
8+
find_package(OpenVDB 10 QUIET)
9+
710
ament_vendor(${PROJECT_NAME}
11+
SATISFIED ${OpenVDB_FOUND}
812
VCS_URL https://github.com/AcademySoftwareFoundation/openvdb.git
913
VCS_VERSION v10.0.1
1014
VCS_TYPE git

openvdb_vendor/openvdb_vendor-extras.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ if(NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "")
44
endif()
55
message( STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}" )
66
list(APPEND CMAKE_MODULE_PATH "${openvdb_vendor_DIR}/../../../opt/openvdb_vendor/lib/cmake/OpenVDB")
7+
list(APPEND CMAKE_MODULE_PATH "/usr/lib/x86_64-linux-gnu/cmake/OpenVDB")
78
find_package(OpenVDB REQUIRED)

openvdb_vendor/package.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model
33
href="http://download.ros.org/schema/package_format2.xsd"
44
schematypens="http://www.w3.org/2001/XMLSchema"?>
5-
<package format="2">
5+
<package format="3">
66
<name>openvdb_vendor</name>
77
<version>2.5.0</version>
88
<description>
@@ -26,6 +26,7 @@
2626
<depend>libblosc-dev</depend>
2727
<depend>libboost-iostreams-dev</depend>
2828
<depend>libboost-thread-dev</depend>
29+
<depend condition="$ROS_DISTRO != humble and $ROS_DISTRO != iron">libopenvdb-dev</depend>
2930
<depend>tbb</depend>
3031
<depend>zlib</depend>
3132

0 commit comments

Comments
 (0)