Move find_package calls

Signed-off-by: Stephen Brawner <brawner@gmail.com>
ros2 · Oct 21, 2020 · f7d55da · f7d55da
1 parent 2318c4f
commit f7d55da
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/rclcpp/CMakeLists.txt b/rclcpp/CMakeLists.txt
@@ -222,13 +222,6 @@ if(BUILD_TESTING)
   find_package(ament_lint_auto REQUIRED)
   ament_lint_auto_find_test_dependencies()
 
-  # For benchmark tests. Currently these libraries can't be found if these calls
-  # are located in the CMakeLists.txt in test/rclcpp/benchmark, which implies
-  # some sort of scope issue
-  find_package(benchmark REQUIRED)
-  find_package(osrf_testing_tools_cpp REQUIRED)
-  find_package(performance_test_fixture REQUIRED)
-
   add_subdirectory(test)
 endif()
 

diff --git a/rclcpp/test/benchmark/CMakeLists.txt b/rclcpp/test/benchmark/CMakeLists.txt
@@ -1,3 +1,5 @@
+find_package(performance_test_fixture REQUIRED)
+
 # Give cppcheck hints about macro definitions coming from outside this package
 get_target_property(
   ament_cmake_cppcheck_ADDITIONAL_INCLUDE_DIRS