aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudio Fantacci <claudiofantacci@users.noreply.github.com>2019-06-17 23:38:05 +0200
committerVictor Romero <romerosanchezv@gmail.com>2019-06-17 14:38:05 -0700
commit302c43f9319b5d8e432619262920b8608855f769 (patch)
treed598a359639fbc90b256479b30067658155a026d
parent70c615012fa3c3a66fb2bae715055a6d59085861 (diff)
downloadvcpkg-302c43f9319b5d8e432619262920b8608855f769.tar.gz
vcpkg-302c43f9319b5d8e432619262920b8608855f769.zip
[realsense2] Update to v2.19.0 (#5777)
* [realsense2] Update to v2.19.0 * [realsense2] Update to version 2.22.0
-rw-r--r--ports/realsense2/CONTROL16
-rw-r--r--ports/realsense2/portfile.cmake41
2 files changed, 29 insertions, 28 deletions
diff --git a/ports/realsense2/CONTROL b/ports/realsense2/CONTROL
index 5147c77cf..34698dbd6 100644
--- a/ports/realsense2/CONTROL
+++ b/ports/realsense2/CONTROL
@@ -1,8 +1,8 @@
-Source: realsense2
-Version: 2.16.1-2
-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).
-
-Feature: tools
-Build-Depends: opengl
-Description: Build Intel® RealSense™ examples and tools
+Source: realsense2
+Version: 2.22.0
+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).
+
+Feature: tools
+Build-Depends: opengl
+Description: Build Intel® RealSense™ examples and tools
diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake
index 0d8ae7cdc..8d5def7c8 100644
--- a/ports/realsense2/portfile.cmake
+++ b/ports/realsense2/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO IntelRealSense/librealsense
- REF v2.16.1
- SHA512 e030f7b1833db787b8976ead734535fb2209a19317d74d4f68bd8f8cae38abe2343d584e88131a1a66bf6f9f1c0a17bc2c64540841a74cf6300fecf3e69f9dff
+ REF v2.22.0
+ SHA512 7595780c1955a2d4a91df5b70ab6366c672f389bc3d2dcb9f2e78a2ea1fc875c65f878103df483205e17f62dfd024ee5f7ccb15afc5d18978d3c25aa071652ab
HEAD_REF development
)
@@ -13,47 +13,48 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_CRT_LINKAGE)
set(BUILD_EXAMPLES OFF)
set(BUILD_GRAPHICAL_EXAMPLES OFF)
if("tools" IN_LIST FEATURES)
- set(BUILD_EXAMPLES ON)
- set(BUILD_GRAPHICAL_EXAMPLES ON)
+ set(BUILD_EXAMPLES ON)
+ set(BUILD_GRAPHICAL_EXAMPLES ON)
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
OPTIONS
- #Ungrouped Entries
-DENFORCE_METADATA=ON
- # BUILD
- -DBUILD_EXAMPLES=${BUILD_EXAMPLES}
- -DBUILD_GRAPHICAL_EXAMPLES=${BUILD_GRAPHICAL_EXAMPLES}
- -DBUILD_UNIT_TESTS=OFF
+ -DBUILD_WITH_TM2=OFF
-DBUILD_WITH_OPENMP=OFF
+ -DBUILD_UNIT_TESTS=OFF
-DBUILD_WITH_STATIC_CRT=${BUILD_CRT_LINKAGE}
+ OPTIONS_RELEASE
+ -DBUILD_EXAMPLES=${BUILD_EXAMPLES}
+ -DBUILD_GRAPHICAL_EXAMPLES=${BUILD_GRAPHICAL_EXAMPLES}
OPTIONS_DEBUG
- # BUILD
-DBUILD_EXAMPLES=OFF
-DBUILD_GRAPHICAL_EXAMPLES=OFF
- # CMAKE
- -DCMAKE_PDB_OUTPUT_DIRECTORY=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
- -DCMAKE_DEBUG_POSTFIX=_d
)
vcpkg_install_cmake()
+
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/realsense2)
+
vcpkg_copy_pdbs()
+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
if(BUILD_EXAMPLES)
- file(GLOB EXEFILES_RELEASE ${CURRENT_PACKAGES_DIR}/bin/rs-* ${CURRENT_PACKAGES_DIR}/bin/realsense-*)
+ file(GLOB EXEFILES_RELEASE
+ ${CURRENT_PACKAGES_DIR}/bin/rs-*
+ ${CURRENT_PACKAGES_DIR}/bin/realsense-*
+ )
+
if (EXEFILES_RELEASE)
file(COPY ${EXEFILES_RELEASE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/realsense2)
file(REMOVE ${EXEFILES_RELEASE})
endif()
- file(GLOB EXEFILES_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/*)
- if (EXEFILES_DEBUG)
- file(REMOVE ${EXEFILES_RELEASE} ${EXEFILES_DEBUG})
- endif()
+
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/realsense2)
file(GLOB BINS ${CURRENT_PACKAGES_DIR}/bin/*)
@@ -62,5 +63,5 @@ if(BUILD_EXAMPLES)
endif()
endif()
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/realsense2)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/realsense2/COPYING ${CURRENT_PACKAGES_DIR}/share/realsense2/copyright)
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/realsense2)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/realsense2/LICENSE ${CURRENT_PACKAGES_DIR}/share/realsense2/copyright)