make Spinnaker private

spinnaker_camera_driver/CMakeLists.txt

@@ -114,6 +114,7 @@ target_link_libraries(camera_driver
   ${sensor_msgs_TARGETS}
   ${std_msgs_TARGETS}
   yaml-cpp
+  PRIVATE
   Spinnaker::Spinnaker)
 
 target_include_directories(camera_driver
@@ -128,7 +129,7 @@ rclcpp_components_register_nodes(camera_driver "spinnaker_camera_driver::CameraD
 add_executable(camera_driver_node
   src/camera_driver_node.cpp)
 
-target_link_libraries(camera_driver_node camera_driver)
+target_link_libraries(camera_driver_node PUBLIC camera_driver PRIVATE Spinnaker::Spinnaker)
 
 target_include_directories(camera_driver_node
   PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>

spinnaker_camera_driver/cmake/spinnaker_camera_driverConfig.cmake.in

@@ -1,6 +1,6 @@
 include(CMakeFindDependencyMacro)
 
-find_dependency(SPINNAKER)
+# find_dependency(SPINNAKER)
 find_dependency(rclcpp)
 find_dependency(rclcpp_components)
 find_dependency(camera_info_manager)

spinnaker_synchronized_camera_driver/CMakeLists.txt

@@ -33,31 +33,6 @@ if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE RelWithDebInfo)
 endif()
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
-# The spinnaker_camera_driver links against the spinnaker libraries,
-# and also exports them as a dependency. However, if the spinnaker SDK
-# is not installed system-wide, then the spinnaker_camera_driver actually
-# installs a private copy of the spinnaker SDK libraries alongside its own
-# libraries. The hack below works detects this scenario and works around it.
-
-find_package(SPINNAKER)
-if(NOT SPINNAKER_FOUND)
-  # assumes that "spinnaker_camera_driver" is installed at the same root
-  # as "spinnaker_synchronized_camera_driver"
-  cmake_path(GET CMAKE_INSTALL_FULL_LIBDIR PARENT_PATH SPINNAKER_ROOT_DIR)
-  cmake_path(GET SPINNAKER_ROOT_DIR PARENT_PATH SPINNAKER_ROOT_DIR)
-  cmake_path(APPEND SPINNAKER_ROOT_DIR "spinnaker_camera_driver")
-  message(STATUS "searching for spinnaker here: ${SPINNAKER_ROOT_DIR}")
-  # SPINNAKER_ROOT_DIR will be actually used when
-  # find_package(spinnaker_camera_driver) executes a find_package(SPINNAKER).
-  # This find_package(SPINNAKER) is actually triggered by
-  # spinnaker_camera_driverConfig.cmake.in
-  # But the FindSPINNAKER.cmake used for that search is actually the one
-  # in spinnaker_synchronized_camera_driver/cmake/,
-  # which has been stripped to not search for the include path.
-endif()
-
 find_package(spinnaker_camera_driver REQUIRED)
 
 # list of all packages that use ament for export (may work for others too)