From 584ad9525747505a2ffe6a645ec88dd94cd50ab7 Mon Sep 17 00:00:00 2001
From: Jake Keller <jakeller3630@gmail.com>
Date: Tue, 15 Apr 2025 02:20:26 +0000
Subject: [PATCH 1/3] Fix unit test CMake bug and small typos

---
 CMakeLists.txt       | 6 +++---
 tests/CMakeLists.txt | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b6d1ebaa..9b4a26727 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,7 @@ if ( ament_cmake_FOUND )
 
     add_definitions( -DUSING_ROS2 )
     message(STATUS "------------------------------------------")
-    message(STATUS "BehaviourTree is being built using AMENT.")
+    message(STATUS "BehaviorTree is being built using AMENT.")
     message(STATUS "------------------------------------------")
     include(cmake/ament_build.cmake)
 
@@ -63,13 +63,13 @@ elseif( CATKIN_DEVEL_PREFIX OR CATKIN_BUILD_BINARY_PACKAGE)
 
     add_definitions( -DUSING_ROS )
     message(STATUS "------------------------------------------")
-    message(STATUS "BehaviourTree is being built using CATKIN.")
+    message(STATUS "BehaviorTree is being built using CATKIN.")
     message(STATUS "------------------------------------------")
     include(cmake/catkin_build.cmake)
     set(catkin_FOUND TRUE)
 else()
     message(STATUS "------------------------------------------")
-    message(STATUS "BehaviourTree is being built with conan.")
+    message(STATUS "BehaviorTree is being built with conan.")
     message(STATUS "------------------------------------------")
     include(cmake/conan_build.cmake)
 endif()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 738f352e8..19b4eb6af 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -55,7 +55,7 @@ elseif(catkin_FOUND AND CATKIN_ENABLE_TESTING)
         Threads::Threads
         ${catkin_LIBRARIES})
 
-else()
+elseif(NOT ament_cmake_FOUND AND NOT catkin_FOUND)
 
     find_package(GTest REQUIRED)
     enable_testing()

From 47de5c01ed66c899a9d31111ec6ff8f54ea1b631 Mon Sep 17 00:00:00 2001
From: Jake Keller <jakeller3630@gmail.com>
Date: Tue, 15 Apr 2025 02:30:26 +0000
Subject: [PATCH 2/3] Fix bug when building with ros when testing is off

---
 tests/CMakeLists.txt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 19b4eb6af..43cab73ff 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -69,5 +69,9 @@ elseif(NOT ament_cmake_FOUND AND NOT catkin_FOUND)
 
 endif()
 
-target_include_directories(${BTCPP_LIBRARY}_test PRIVATE include ${PROJECT_SOURCE_DIR}/3rdparty)
-target_compile_definitions(${BTCPP_LIBRARY}_test PRIVATE BT_TEST_FOLDER="${CMAKE_CURRENT_SOURCE_DIR}")
+if(TARGET ${BT_CPP_LIBRARY}_test)
+
+    target_include_directories(${BTCPP_LIBRARY}_test PRIVATE include ${PROJECT_SOURCE_DIR}/3rdparty)
+    target_compile_definitions(${BTCPP_LIBRARY}_test PRIVATE BT_TEST_FOLDER="${CMAKE_CURRENT_SOURCE_DIR}")
+
+endif()

From 40bb1abd0f9786912d219fa1e1bb35fc746ea071 Mon Sep 17 00:00:00 2001
From: Jake Keller <jakeller3630@gmail.com>
Date: Tue, 15 Apr 2025 02:48:04 +0000
Subject: [PATCH 3/3] Revert commit and eliminate BUILD_TESTING check

---
 tests/CMakeLists.txt | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 43cab73ff..700aa64af 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -38,7 +38,7 @@ set(TEST_DEPENDECIES
     foonathan::lexy
     bt_sample_nodes)
 
-if(ament_cmake_FOUND AND BUILD_TESTING)
+if(ament_cmake_FOUND)
 
     find_package(ament_cmake_gtest REQUIRED)
 
@@ -55,7 +55,7 @@ elseif(catkin_FOUND AND CATKIN_ENABLE_TESTING)
         Threads::Threads
         ${catkin_LIBRARIES})
 
-elseif(NOT ament_cmake_FOUND AND NOT catkin_FOUND)
+else()
 
     find_package(GTest REQUIRED)
     enable_testing()
@@ -69,9 +69,5 @@ elseif(NOT ament_cmake_FOUND AND NOT catkin_FOUND)
 
 endif()
 
-if(TARGET ${BT_CPP_LIBRARY}_test)
-
-    target_include_directories(${BTCPP_LIBRARY}_test PRIVATE include ${PROJECT_SOURCE_DIR}/3rdparty)
-    target_compile_definitions(${BTCPP_LIBRARY}_test PRIVATE BT_TEST_FOLDER="${CMAKE_CURRENT_SOURCE_DIR}")
-
-endif()
+target_include_directories(${BTCPP_LIBRARY}_test PRIVATE include ${PROJECT_SOURCE_DIR}/3rdparty)
+target_compile_definitions(${BTCPP_LIBRARY}_test PRIVATE BT_TEST_FOLDER="${CMAKE_CURRENT_SOURCE_DIR}")