Skip to content

Commit e534a9d

Browse files
authored
[realsense2] fix single config builds (microsoft#42449)
1 parent 3c24aa3 commit e534a9d

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

ports/realsense2/portfile.cmake

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,11 @@ vcpkg_cmake_install()
5050
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/realsense2)
5151
if(VCPKG_TARGET_IS_WINDOWS)
5252
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/realsense2/realsense2Targets.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "\${_IMPORT_PREFIX}")
53-
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/realsense2/realsense2Targets.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "\${_IMPORT_PREFIX}")
54-
55-
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/common/fw")
56-
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/common/fw/fw.res" DESTINATION "${CURRENT_PACKAGES_DIR}/common/fw")
53+
if(NOT VCPKG_BUILD_TYPE)
54+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/realsense2/realsense2Targets.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" "\${_IMPORT_PREFIX}")
55+
endif()
56+
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/common/fw")
57+
file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/common/fw/fw.res" DESTINATION "${CURRENT_PACKAGES_DIR}/common/fw")
5758
endif()
5859
vcpkg_copy_pdbs()
5960

ports/realsense2/vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "realsense2",
33
"version": "2.56.2",
4-
"port-version": 1,
4+
"port-version": 2,
55
"description": "Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).",
66
"homepage": "https://github.com/IntelRealSense/librealsense",
77
"license": "Apache-2.0",

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7886,7 +7886,7 @@
78867886
},
78877887
"realsense2": {
78887888
"baseline": "2.56.2",
7889-
"port-version": 1
7889+
"port-version": 2
78907890
},
78917891
"recast": {
78927892
"baseline": "deprecated",

versions/r-/realsense2.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "16b54def1f75d71eb6b30ecc5b33cdcda10ea9e6",
5+
"version": "2.56.2",
6+
"port-version": 2
7+
},
38
{
49
"git-tree": "3f099d34f5d5bf7b0354e667018c0caae7966229",
510
"version": "2.56.2",

0 commit comments

Comments
 (0)