Fix unit test CMake bug and small typos

Author: sarcasticnature

CMakeLists.txt

@@ -55,21 +55,21 @@ 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)
 
 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()

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()