From e534a9d589ff25fecd29c3430dfcf0a42fdc4cb6 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 16 Dec 2024 19:10:14 +0100 Subject: [PATCH] [realsense2] fix single config builds (#42449) --- ports/realsense2/portfile.cmake | 9 +++++---- ports/realsense2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/realsense2.json | 5 +++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake index cd6d453e65..4ed0070642 100644 --- a/ports/realsense2/portfile.cmake +++ b/ports/realsense2/portfile.cmake @@ -50,10 +50,11 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/realsense2) if(VCPKG_TARGET_IS_WINDOWS) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/realsense2/realsense2Targets.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "\${_IMPORT_PREFIX}") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/realsense2/realsense2Targets.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "\${_IMPORT_PREFIX}") - - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/common/fw") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/common/fw/fw.res" DESTINATION "${CURRENT_PACKAGES_DIR}/common/fw") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/realsense2/realsense2Targets.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "\${_IMPORT_PREFIX}") + endif() + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/common/fw") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/common/fw/fw.res" DESTINATION "${CURRENT_PACKAGES_DIR}/common/fw") endif() vcpkg_copy_pdbs() diff --git a/ports/realsense2/vcpkg.json b/ports/realsense2/vcpkg.json index 80a2cb8879..9c42753c9a 100644 --- a/ports/realsense2/vcpkg.json +++ b/ports/realsense2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "realsense2", "version": "2.56.2", - "port-version": 1, + "port-version": 2, "description": "Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).", "homepage": "https://github.com/IntelRealSense/librealsense", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 697917fcef..22a9ed8bce 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7886,7 +7886,7 @@ }, "realsense2": { "baseline": "2.56.2", - "port-version": 1 + "port-version": 2 }, "recast": { "baseline": "deprecated", diff --git a/versions/r-/realsense2.json b/versions/r-/realsense2.json index 0580d73880..538430cbf9 100644 --- a/versions/r-/realsense2.json +++ b/versions/r-/realsense2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "16b54def1f75d71eb6b30ecc5b33cdcda10ea9e6", + "version": "2.56.2", + "port-version": 2 + }, { "git-tree": "3f099d34f5d5bf7b0354e667018c0caae7966229", "version": "2.56.2",