diff --git a/extensions/depthengine/libdepthengine.so b/extensions/depthengine/libdepthengine.so deleted file mode 100644 index dd818fae..00000000 Binary files a/extensions/depthengine/libdepthengine.so and /dev/null differ diff --git a/orbbec_camera/CMakeLists.txt b/orbbec_camera/CMakeLists.txt index e86ec4fd..99d1f60d 100644 --- a/orbbec_camera/CMakeLists.txt +++ b/orbbec_camera/CMakeLists.txt @@ -227,6 +227,7 @@ install(DIRECTORY launch DESTINATION share/${PROJECT_NAME}/) install(DIRECTORY config DESTINATION share/${PROJECT_NAME}/) install(DIRECTORY ${ORBBEC_INCLUDE_DIR} DESTINATION include) install(DIRECTORY ${ORBBEC_LIBS_DIR}/ DESTINATION lib/ FILES_MATCHING PATTERN "*.so*") +install(DIRECTORY ${ORBBEC_LIBS_DIR}/extensions DESTINATION lib/) if (DEFINED ENV{BUILDING_PACKAGE}) # Install udev rules install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/99-obsensor-libusb.rules diff --git a/orbbec_camera/SDK/lib/x64/OrbbecSDKConfig-release.cmake b/orbbec_camera/SDK/lib/x64/OrbbecSDKConfig-release.cmake new file mode 100644 index 00000000..fd4cb77f --- /dev/null +++ b/orbbec_camera/SDK/lib/x64/OrbbecSDKConfig-release.cmake @@ -0,0 +1,19 @@ +#---------------------------------------------------------------- +# Generated CMake target import file for configuration "Release". +#---------------------------------------------------------------- + +# Commands may need to know the format version. +set(CMAKE_IMPORT_FILE_VERSION 1) + +# Import target "ob::OrbbecSDK" for configuration "Release" +set_property(TARGET ob::OrbbecSDK APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) +set_target_properties(ob::OrbbecSDK PROPERTIES + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so" + IMPORTED_SONAME_RELEASE "libOrbbecSDK.so" + ) + +list(APPEND _IMPORT_CHECK_TARGETS ob::OrbbecSDK ) +list(APPEND _IMPORT_CHECK_FILES_FOR_ob::OrbbecSDK "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so" ) + +# Commands beyond this point should not need to know the version. +set(CMAKE_IMPORT_FILE_VERSION) diff --git a/orbbec_camera/SDK/lib/x64/OrbbecSDKConfig.cmake b/orbbec_camera/SDK/lib/x64/OrbbecSDKConfig.cmake new file mode 100644 index 00000000..c127835a --- /dev/null +++ b/orbbec_camera/SDK/lib/x64/OrbbecSDKConfig.cmake @@ -0,0 +1,92 @@ +# Generated by CMake + +if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) + message(FATAL_ERROR "CMake >= 2.6.0 required") +endif() +cmake_policy(PUSH) +cmake_policy(VERSION 2.6) +#---------------------------------------------------------------- +# Generated CMake target import file. +#---------------------------------------------------------------- + +# Commands may need to know the format version. +set(CMAKE_IMPORT_FILE_VERSION 1) + +# Protect against multiple inclusion, which would fail when already imported targets are added once more. +set(_targetsDefined) +set(_targetsNotDefined) +set(_expectedTargets) +foreach(_expectedTarget ob::OrbbecSDK) + list(APPEND _expectedTargets ${_expectedTarget}) + if(NOT TARGET ${_expectedTarget}) + list(APPEND _targetsNotDefined ${_expectedTarget}) + endif() + if(TARGET ${_expectedTarget}) + list(APPEND _targetsDefined ${_expectedTarget}) + endif() +endforeach() +if("${_targetsDefined}" STREQUAL "${_expectedTargets}") + unset(_targetsDefined) + unset(_targetsNotDefined) + unset(_expectedTargets) + set(CMAKE_IMPORT_FILE_VERSION) + cmake_policy(POP) + return() +endif() +if(NOT "${_targetsDefined}" STREQUAL "") + message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_targetsDefined}\nTargets not yet defined: ${_targetsNotDefined}\n") +endif() +unset(_targetsDefined) +unset(_targetsNotDefined) +unset(_expectedTargets) + + +# Compute the installation prefix relative to this file. +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +if(_IMPORT_PREFIX STREQUAL "/") + set(_IMPORT_PREFIX "") +endif() + +# Create imported target ob::OrbbecSDK +add_library(ob::OrbbecSDK SHARED IMPORTED) + +set_target_properties(ob::OrbbecSDK PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" +) + +# Load information for each installed configuration. +get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +file(GLOB CONFIG_FILES "${_DIR}/OrbbecSDKConfig-*.cmake") +foreach(f ${CONFIG_FILES}) + include(${f}) +endforeach() + +# Cleanup temporary variables. +set(_IMPORT_PREFIX) + +# Loop over all imported files and verify that they actually exist +foreach(target ${_IMPORT_CHECK_TARGETS} ) + foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} ) + if(NOT EXISTS "${file}" ) + message(FATAL_ERROR "The imported target \"${target}\" references the file + \"${file}\" +but this file does not exist. Possible reasons include: +* The file was deleted, renamed, or moved to another location. +* An install or uninstall procedure did not complete successfully. +* The installation package was faulty and contained + \"${CMAKE_CURRENT_LIST_FILE}\" +but not all the files it references. +") + endif() + endforeach() + unset(_IMPORT_CHECK_FILES_FOR_${target}) +endforeach() +unset(_IMPORT_CHECK_TARGETS) + +# This file does not depend on other imported targets which have +# been exported from the same project but in a separate export set. + +# Commands beyond this point should not need to know the version. +set(CMAKE_IMPORT_FILE_VERSION) +cmake_policy(POP) diff --git a/orbbec_camera/SDK/lib/x64/extensions/depthengine/libdepthengine.so b/orbbec_camera/SDK/lib/x64/extensions/depthengine/libdepthengine.so new file mode 120000 index 00000000..745a98a5 --- /dev/null +++ b/orbbec_camera/SDK/lib/x64/extensions/depthengine/libdepthengine.so @@ -0,0 +1 @@ +libdepthengine.so.2.0 \ No newline at end of file diff --git a/extensions/depthengine/libdepthengine.so.2.0 b/orbbec_camera/SDK/lib/x64/extensions/depthengine/libdepthengine.so.2.0 similarity index 100% rename from extensions/depthengine/libdepthengine.so.2.0 rename to orbbec_camera/SDK/lib/x64/extensions/depthengine/libdepthengine.so.2.0 diff --git a/extensions/filters/libFilterProcessor.so b/orbbec_camera/SDK/lib/x64/extensions/filters/libFilterProcessor.so similarity index 100% rename from extensions/filters/libFilterProcessor.so rename to orbbec_camera/SDK/lib/x64/extensions/filters/libFilterProcessor.so diff --git a/extensions/filters/libob_priv_filter.so b/orbbec_camera/SDK/lib/x64/extensions/filters/libob_priv_filter.so similarity index 100% rename from extensions/filters/libob_priv_filter.so rename to orbbec_camera/SDK/lib/x64/extensions/filters/libob_priv_filter.so diff --git a/extensions/frameprocessor/libob_frame_processor.so b/orbbec_camera/SDK/lib/x64/extensions/frameprocessor/libob_frame_processor.so similarity index 100% rename from extensions/frameprocessor/libob_frame_processor.so rename to orbbec_camera/SDK/lib/x64/extensions/frameprocessor/libob_frame_processor.so diff --git a/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so b/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so index d28cf274..12b4749e 100644 Binary files a/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so and b/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so differ diff --git a/orbbec_camera/SDK/lib/x64/liblive555.so b/orbbec_camera/SDK/lib/x64/liblive555.so deleted file mode 100644 index f6152c4f..00000000 Binary files a/orbbec_camera/SDK/lib/x64/liblive555.so and /dev/null differ diff --git a/orbbec_camera/SDK/lib/x64/libob_usb.so b/orbbec_camera/SDK/lib/x64/libob_usb.so deleted file mode 100644 index e8a1b9d0..00000000 Binary files a/orbbec_camera/SDK/lib/x64/libob_usb.so and /dev/null differ diff --git a/orbbec_camera/SDK/lib/x64/openobsdkConfig-release.cmake b/orbbec_camera/SDK/lib/x64/openobsdkConfig-release.cmake deleted file mode 100644 index 053a6d93..00000000 --- a/orbbec_camera/SDK/lib/x64/openobsdkConfig-release.cmake +++ /dev/null @@ -1,19 +0,0 @@ -#---------------------------------------------------------------- -# Generated CMake target import file for configuration "Release". -#---------------------------------------------------------------- - -# Commands may need to know the format version. -set(CMAKE_IMPORT_FILE_VERSION 1) - -# Import target "ob::openobsdk" for configuration "Release" -set_property(TARGET ob::openobsdk APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) -set_target_properties(ob::openobsdk PROPERTIES - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libopenobsdk.so" - IMPORTED_SONAME_RELEASE "libopenobsdk.so" - ) - -list(APPEND _cmake_import_check_targets ob::openobsdk ) -list(APPEND _cmake_import_check_files_for_ob::openobsdk "${_IMPORT_PREFIX}/lib/libopenobsdk.so" ) - -# Commands beyond this point should not need to know the version. -set(CMAKE_IMPORT_FILE_VERSION) diff --git a/orbbec_camera/SDK/lib/x64/openobsdkConfig.cmake b/orbbec_camera/SDK/lib/x64/openobsdkConfig.cmake deleted file mode 100644 index 3a27e9d7..00000000 --- a/orbbec_camera/SDK/lib/x64/openobsdkConfig.cmake +++ /dev/null @@ -1,104 +0,0 @@ -# Generated by CMake - -if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8) - message(FATAL_ERROR "CMake >= 2.8.0 required") -endif() -if(CMAKE_VERSION VERSION_LESS "2.8.3") - message(FATAL_ERROR "CMake >= 2.8.3 required") -endif() -cmake_policy(PUSH) -cmake_policy(VERSION 2.8.3...3.28) -#---------------------------------------------------------------- -# Generated CMake target import file. -#---------------------------------------------------------------- - -# Commands may need to know the format version. -set(CMAKE_IMPORT_FILE_VERSION 1) - -# Protect against multiple inclusion, which would fail when already imported targets are added once more. -set(_cmake_targets_defined "") -set(_cmake_targets_not_defined "") -set(_cmake_expected_targets "") -foreach(_cmake_expected_target IN ITEMS ob::openobsdk) - list(APPEND _cmake_expected_targets "${_cmake_expected_target}") - if(TARGET "${_cmake_expected_target}") - list(APPEND _cmake_targets_defined "${_cmake_expected_target}") - else() - list(APPEND _cmake_targets_not_defined "${_cmake_expected_target}") - endif() -endforeach() -unset(_cmake_expected_target) -if(_cmake_targets_defined STREQUAL _cmake_expected_targets) - unset(_cmake_targets_defined) - unset(_cmake_targets_not_defined) - unset(_cmake_expected_targets) - unset(CMAKE_IMPORT_FILE_VERSION) - cmake_policy(POP) - return() -endif() -if(NOT _cmake_targets_defined STREQUAL "") - string(REPLACE ";" ", " _cmake_targets_defined_text "${_cmake_targets_defined}") - string(REPLACE ";" ", " _cmake_targets_not_defined_text "${_cmake_targets_not_defined}") - message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_cmake_targets_defined_text}\nTargets not yet defined: ${_cmake_targets_not_defined_text}\n") -endif() -unset(_cmake_targets_defined) -unset(_cmake_targets_not_defined) -unset(_cmake_expected_targets) - - -# Compute the installation prefix relative to this file. -get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) -if(_IMPORT_PREFIX STREQUAL "/") - set(_IMPORT_PREFIX "") -endif() - -# Create imported target ob::openobsdk -add_library(ob::openobsdk SHARED IMPORTED) - -set_target_properties(ob::openobsdk PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" -) - -# Load information for each installed configuration. -file(GLOB _cmake_config_files "${CMAKE_CURRENT_LIST_DIR}/openobsdkConfig-*.cmake") -foreach(_cmake_config_file IN LISTS _cmake_config_files) - include("${_cmake_config_file}") -endforeach() -unset(_cmake_config_file) -unset(_cmake_config_files) - -# Cleanup temporary variables. -set(_IMPORT_PREFIX) - -# Loop over all imported files and verify that they actually exist -foreach(_cmake_target IN LISTS _cmake_import_check_targets) - if(CMAKE_VERSION VERSION_LESS "3.28" - OR NOT DEFINED _cmake_import_check_xcframework_for_${_cmake_target} - OR NOT IS_DIRECTORY "${_cmake_import_check_xcframework_for_${_cmake_target}}") - foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}") - if(NOT EXISTS "${_cmake_file}") - message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file - \"${_cmake_file}\" -but this file does not exist. Possible reasons include: -* The file was deleted, renamed, or moved to another location. -* An install or uninstall procedure did not complete successfully. -* The installation package was faulty and contained - \"${CMAKE_CURRENT_LIST_FILE}\" -but not all the files it references. -") - endif() - endforeach() - endif() - unset(_cmake_file) - unset("_cmake_import_check_files_for_${_cmake_target}") -endforeach() -unset(_cmake_target) -unset(_cmake_import_check_targets) - -# This file does not depend on other imported targets which have -# been exported from the same project but in a separate export set. - -# Commands beyond this point should not need to know the version. -set(CMAKE_IMPORT_FILE_VERSION) -cmake_policy(POP)