Skip to content

Commit 3a00bc3

Browse files
authoredApr 16, 2025··
Fix testing CMake issue to resolve Rolling regression (#961)
* Fix unit test CMake bug and small typos * Fix bug when building with ros when testing is off * Revert commit and eliminate BUILD_TESTING check
1 parent 3651a24 commit 3a00bc3

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed
 

‎CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,21 +79,21 @@ if ( ament_cmake_FOUND )
7979

8080
add_definitions( -DUSING_ROS2 )
8181
message(STATUS "------------------------------------------")
82-
message(STATUS "BehaviourTree is being built using AMENT.")
82+
message(STATUS "BehaviorTree is being built using AMENT.")
8383
message(STATUS "------------------------------------------")
8484
include(cmake/ament_build.cmake)
8585

8686
elseif( CATKIN_DEVEL_PREFIX OR CATKIN_BUILD_BINARY_PACKAGE)
8787

8888
add_definitions( -DUSING_ROS )
8989
message(STATUS "------------------------------------------")
90-
message(STATUS "BehaviourTree is being built using CATKIN.")
90+
message(STATUS "BehaviorTree is being built using CATKIN.")
9191
message(STATUS "------------------------------------------")
9292
include(cmake/catkin_build.cmake)
9393
set(catkin_FOUND TRUE)
9494
else()
9595
message(STATUS "------------------------------------------")
96-
message(STATUS "BehaviourTree is being built with conan.")
96+
message(STATUS "BehaviorTree is being built with conan.")
9797
message(STATUS "------------------------------------------")
9898
include(cmake/conan_build.cmake)
9999
endif()

‎tests/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ set(TEST_DEPENDECIES
3838
foonathan::lexy
3939
bt_sample_nodes)
4040

41-
if(ament_cmake_FOUND AND BUILD_TESTING)
41+
if(ament_cmake_FOUND)
4242

4343
find_package(ament_cmake_gtest REQUIRED)
4444

0 commit comments

Comments
 (0)
Please sign in to comment.