Fix livox driver build

Also add caching to the apt-get installs
This commit is contained in:
Matt Spencer
2026-07-18 10:23:36 +00:00
parent 48eb4d10fd
commit 6cf51a3b67
3 changed files with 57 additions and 16 deletions
+27
View File
@@ -1,3 +1,30 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7344d08..3d531a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,9 @@
+# Default to the ROS2 build unless ROS1 is explicitly requested, so the else()
+# (ROS2) branch below is taken when ROS_EDITION is unset or set to "ROS2".
+if(NOT ROS_EDITION)
+ set(ROS_EDITION "ROS2")
+endif()
+
# judge which cmake codes to use
if(ROS_EDITION STREQUAL "ROS1")
@@ -191,6 +197,12 @@ else(ROS_EDITION STREQUAL "ROS2")
cmake_minimum_required(VERSION 3.14)
project(livox_ros_driver2)
+ # Fall back to the sourced ROS distro when -DDISTRO_ROS was not passed, so a
+ # plain `colcon build` behaves the same as the flagged Dockerfile build.
+ if(NOT DISTRO_ROS)
+ set(DISTRO_ROS "$ENV{ROS_DISTRO}")
+ endif()
+
# Default to C99
if(NOT CMAKE_C_STANDARD)
set(CMAKE_C_STANDARD 99)
diff --git a/launch b/launch
new file mode 120000
index 0000000..163fb01