diff options
| author | Ilya Arzhannikov <iarzhannikov@artec-group.com> | 2021-01-20 00:28:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-19 15:28:30 -0800 |
| commit | 2f542209ce25b9621279f149ebac5402cfaccbe5 (patch) | |
| tree | aedc0fc862970a4a3ef1fd01baddffd03b6a32bc | |
| parent | ab077c4e55e1c17e6603b539f6497a2bf76f25e6 (diff) | |
| download | vcpkg-2f542209ce25b9621279f149ebac5402cfaccbe5.tar.gz vcpkg-2f542209ce25b9621279f149ebac5402cfaccbe5.zip | |
Librealsense2 android build (#15608)
* [realsense2] options for android build
* bump port version
* update baseline
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
| -rw-r--r-- | port_versions/baseline.json | 2 | ||||
| -rw-r--r-- | port_versions/r-/realsense2.json | 5 | ||||
| -rw-r--r-- | ports/realsense2/CONTROL | 1 | ||||
| -rw-r--r-- | ports/realsense2/portfile.cmake | 6 |
4 files changed, 13 insertions, 1 deletions
diff --git a/port_versions/baseline.json b/port_versions/baseline.json index 66d71ff5f..974688fc4 100644 --- a/port_versions/baseline.json +++ b/port_versions/baseline.json @@ -4998,7 +4998,7 @@ }, "realsense2": { "baseline": "2.40.0", - "port-version": 0 + "port-version": 1 }, "recast": { "baseline": "1.5.1-3", diff --git a/port_versions/r-/realsense2.json b/port_versions/r-/realsense2.json index b3aa46be8..71d781a59 100644 --- a/port_versions/r-/realsense2.json +++ b/port_versions/r-/realsense2.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "7a17b91ddec89be9345ca08ba098ffec3ee4618d", + "version-string": "2.40.0", + "port-version": 1 + }, + { "git-tree": "c3d32b35fd3a11aec9bd32f3f458ea4b099816f7", "version-string": "2.40.0", "port-version": 0 diff --git a/ports/realsense2/CONTROL b/ports/realsense2/CONTROL index 3b4228326..84af14d20 100644 --- a/ports/realsense2/CONTROL +++ b/ports/realsense2/CONTROL @@ -1,5 +1,6 @@ Source: realsense2 Version: 2.40.0 +Port-Version: 1 Homepage: https://github.com/IntelRealSense/librealsense Description: Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300). Build-Depends: libusb(linux) diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake index fc218d279..d7208ec1b 100644 --- a/ports/realsense2/portfile.cmake +++ b/ports/realsense2/portfile.cmake @@ -26,6 +26,11 @@ if(("openni2" IN_LIST FEATURES) AND (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")) set(BUILD_OPENNI2_BINDINGS ON) endif() +set(PLATFORM_OPTIONS) +if (VCPKG_TARGET_IS_ANDROID) + list(APPEND PLATFORM_OPTIONS -DFORCE_RSUSB_BACKEND=ON) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -36,6 +41,7 @@ vcpkg_configure_cmake( -DBUILD_WITH_STATIC_CRT=${BUILD_CRT_LINKAGE} -DBUILD_OPENNI2_BINDINGS=${BUILD_OPENNI2_BINDINGS} -DOPENNI2_DIR=${CURRENT_INSTALLED_DIR}/include/openni2 + ${PLATFORM_OPTIONS} OPTIONS_RELEASE -DBUILD_EXAMPLES=${BUILD_TOOLS} -DBUILD_GRAPHICAL_EXAMPLES=${BUILD_TOOLS} |