Skip to content

Commit 4afbb37

Browse files
committed
Small build fixes
1 parent 3021b9b commit 4afbb37

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

roboplan_oink/CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,15 @@ else()
3434
set(BUILD_WITH_VECTORIZATION_SUPPORT OFF CACHE INTERNAL "Disable proxsuite vectorization")
3535
set(BUILD_TESTING OFF)
3636

37+
set(_proxsuite_fetch_extra "")
38+
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.24")
39+
list(APPEND _proxsuite_fetch_extra DOWNLOAD_EXTRACT_TIMESTAMP TRUE)
40+
endif()
3741
FetchContent_Declare(
3842
proxsuite
3943
URL https://github.com/Simple-Robotics/proxsuite/archive/refs/tags/v0.7.3.tar.gz
4044
URL_HASH SHA256=e634babff534c8812c6dbc6b022b1d01f9a2a4a9a73cf87a6dc299a4de996904
41-
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
45+
${_proxsuite_fetch_extra}
4246
)
4347
FetchContent_MakeAvailable(proxsuite)
4448

@@ -126,8 +130,8 @@ if (BUILD_TESTING_OINK)
126130
add_subdirectory(test)
127131
endif()
128132

129-
# Build the Python bindings by default (for the scikit-build wheel, colcon, and
130-
# pixi). Override with -DBUILD_PYTHON_BINDINGS=OFF for a pure C++ build.
133+
# Build the Python bindings by default (for the scikit-build wheel, colcon, and pixi).
134+
# Override with -DBUILD_PYTHON_BINDINGS=OFF for a pure C++ build.
131135
option(BUILD_PYTHON_BINDINGS "Build the roboplan_oink Python bindings" ON)
132136
if(BUILD_PYTHON_BINDINGS)
133137
add_subdirectory(bindings)

roboplan_oink/package.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
<build_depend>python3-dev</build_depend>
1616

1717
<depend>roboplan</depend>
18-
<depend>proxsuite</depend>
18+
<!-- TODO: Update as proxsuite gets released on follow-on ROS distro syncs. -->
19+
<depend condition="$ROS_DISTRO != kilted and $ROS_DISTRO != lyrical and $ROS_DISTRO != rolling">proxsuite</depend>
1920

2021
<test_depend>ament_cmake_gmock</test_depend>
2122
<test_depend>libgmock-dev</test_depend>

0 commit comments

Comments
 (0)