Skip to content

Commit

Permalink
more ros build fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jlblancoc committed Jul 26, 2024
1 parent e18b25d commit 16e4900
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
3 changes: 3 additions & 0 deletions 3rdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,9 @@ if(CMAKE_MRPT_HAS_ROBOPEAK_LIDAR AND MRPT_BUILD_rplidar_sdk)
)
set_target_properties(mrpt_rplidar PROPERTIES FOLDER "3rd party")

if(NOT TARGET mrpt::core)
find_package(mrpt-core REQUIRED)
endif()
target_link_libraries(mrpt_rplidar PRIVATE mrpt::core) # To enforce c++17

# needs to be exported, even if private, to make cmake happy since it wants
Expand Down
2 changes: 2 additions & 0 deletions cmakemodules/script_ros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ if (NOT DISABLE_ROS)
# Kinda hack to prevent build farm to time out for "dev" jobs:
# The server scripts always run: (1) build+install, then (2) build+test.
# We will catch the (2) situation and don't build a thing, but return quickly.
if(0) # disabled: re-enable unit tests after package partitioning
if (("${BUILD_TESTING}" STREQUAL "1") AND ("$ENV{HOME}" STREQUAL "/home/buildfarm"))
message(STATUS "====== ROS build farm 'build+test' detected. Aborting tests in this build")
# "make test" shall not fail:
Expand All @@ -161,5 +162,6 @@ if (NOT DISABLE_ROS)
set(MRPT_ABORT_CMAKE_SCRIPT 1)
return()
endif()
endif()

endif() # NOT DISABLE_ROS

0 comments on commit 16e4900

Please sign in to comment.