diff options
Diffstat (limited to 'vcpkg/ports/realsense2/using-firmware.diff')
| -rw-r--r-- | vcpkg/ports/realsense2/using-firmware.diff | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/vcpkg/ports/realsense2/using-firmware.diff b/vcpkg/ports/realsense2/using-firmware.diff new file mode 100644 index 0000000..5bdb93c --- /dev/null +++ b/vcpkg/ports/realsense2/using-firmware.diff @@ -0,0 +1,48 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 24cfb79..b9aafc5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,7 +9,6 @@ set(REPO_ROOT ${CMAKE_CURRENT_SOURCE_DIR}) + include_directories(${REPO_ROOT}) + + include(CMake/lrs_options.cmake) +-include(CMake/connectivity_check.cmake) + #Deprecation message, should be removed in future releases + if(${FORCE_LIBUVC} OR ${FORCE_WINUSB_UVC} OR ${ANDROID_USB_HOST_UVC}) + MESSAGE(DEPRECATION "FORCE_LIBUVC, FORCE_WINUSB_UVC and ANDROID_USB_HOST_UVC are deprecated, use FORCE_RSUSB_BACKEND instead") +@@ -17,7 +16,7 @@ if(${FORCE_LIBUVC} OR ${FORCE_WINUSB_UVC} OR ${ANDROID_USB_HOST_UVC}) + endif() + + # Checking Internet connection, as DEPTH CAM needs to download the FW from amazon cloud +-if(IMPORT_DEPTH_CAM_FW AND NOT INTERNET_CONNECTION) ++if(0) + message(WARNING "No internet connection, disabling IMPORT_DEPTH_CAM_FW") + set(IMPORT_DEPTH_CAM_FW OFF) + endif() +diff --git a/common/fw/CMakeLists.txt b/common/fw/CMakeLists.txt +index f270844..84538cf 100644 +--- a/common/fw/CMakeLists.txt ++++ b/common/fw/CMakeLists.txt +@@ -31,7 +31,11 @@ if (MSVC) + # even then, the linker won't grab a .res out of a .lib object, so it needs to be explicitly listed + # and to find the name of the .res file (across cmake generators) we need to create our own rule. :( + add_custom_command(TARGET ${PROJECT_NAME} BYPRODUCTS ${PROJECT_NAME}.res COMMAND ${CMAKE_RC_COMPILER} ${CMAKE_RC_FLAGS} /I . /fo "${PROJECT_NAME}.res" "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.rc") +- target_link_libraries(${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.res") ++ target_link_libraries(${PROJECT_NAME} PUBLIC ++ "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.res>" ++ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/lib/realsense2/${PROJECT_NAME}.res>" ++ ) ++ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.res" DESTINATION "lib/realsense2") + endif() + + target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>) +@@ -39,8 +43,7 @@ set_target_properties (${PROJECT_NAME} PROPERTIES FOLDER Resources) + + function(target_binary url version sha1 symbol ext) + set(binary "${CMAKE_CURRENT_BINARY_DIR}/${symbol}-${version}${ext}") +- message(STATUS "... ${url}/${symbol}-${version}${ext}") +- file(DOWNLOAD "${url}/${symbol}-${version}${ext}" "${binary}" ++ file(DOWNLOAD "file://${FIRMWARE_DISTFILE}" "${binary}" + EXPECTED_HASH SHA1=${sha1} + STATUS status) + list(GET status 0 error_code) |