Skip to content

Commit

Permalink
remove more spinnaker imports
Browse files Browse the repository at this point in the history
  • Loading branch information
berndpfrommer committed Mar 16, 2024
1 parent 8e5f2f3 commit 08d4dee
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 78 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
include(CMakeFindDependencyMacro)

find_dependency(SPINNAKER)
# find_dependency(SPINNAKER)
find_dependency(rclcpp)
find_dependency(rclcpp_components)
find_dependency(camera_info_manager)
Expand Down
25 changes: 0 additions & 25 deletions spinnaker_synchronized_camera_driver/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
52 changes: 0 additions & 52 deletions spinnaker_synchronized_camera_driver/cmake/FindSPINNAKER.cmake

This file was deleted.

0 comments on commit 08d4dee

Please sign in to comment.