Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[vcpkg baseline][realsense2] Fix config issue on osx #18202

Merged
merged 2 commits into from
Jun 3, 2021
Merged

[vcpkg baseline][realsense2] Fix config issue on osx #18202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a65d640
[vcpkg baseline][realsense2] Fix config issue on osx
PhoebeHui May 31, 2021
42e90d8
Update the baseline version
PhoebeHui May 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions ports/realsense2/CONTROL
View file
Open in desktop

This file was deleted.

12 changes: 12 additions & 0 deletions ports/realsense2/fix_config_osx.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/CMake/unix_config.cmake b/CMake/unix_config.cmake
index 3e5929b..57dbe76 100644
--- a/CMake/unix_config.cmake
+++ b/CMake/unix_config.cmake
@@ -35,7 +35,6 @@ macro(os_set_flags)

if(APPLE)
set(FORCE_RSUSB_BACKEND ON)
- set(BUILD_WITH_TM2 ON)
endif()

if(FORCE_RSUSB_BACKEND)
4 changes: 3 additions & 1 deletion ports/realsense2/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ vcpkg_from_github(
PATCHES
fix_openni2.patch
fix-dependency-glfw3.patch
fix_config_osx.patch
)

file(COPY ${SOURCE_PATH}/src/win7/drivers/IntelRealSense_D400_series_win7.inf DESTINATION ${SOURCE_PATH})
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_CRT_LINKAGE)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
tm2 BUILD_WITH_TM2
FEATURES
tm2 BUILD_WITH_TM2
)

set(BUILD_TOOLS OFF)
Expand Down
31 changes: 31 additions & 0 deletions ports/realsense2/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"name": "realsense2",
"version": "2.42.0",
"port-version": 1,
"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",
"dependencies": [
{
"name": "libusb",
"platform": "linux"
}
],
"features": {
"openni2": {
"description": "Build Intel® RealSense™ OpenNI2 driver",
"dependencies": [
"openni2"
]
},
"tm2": {
"description": "Build Intel® RealSense™ T265 device"
},
"tools": {
"description": "Build Intel® RealSense™ examples and tools",
"dependencies": [
"glfw3",
"opengl"
]
}
}
}
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5330,7 +5330,7 @@
},
"realsense2": {
"baseline": "2.42.0",
"port-version": 0
"port-version": 1
},
"recast": {
"baseline": "1.5.1-3",
Expand Down
5 changes: 5 additions & 0 deletions versions/r-/realsense2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7126a8b0d6dffc469da9a7aeccca58d48f05b1d2",
"version": "2.42.0",
"port-version": 1
},
{
"git-tree": "4d8620f1907de79152086b5f98a2fce0cb24c438",
"version-string": "2.42.0",
Expand Down