diff options
| author | Rémy Tassoux <contact@rt2.fr> | 2020-07-06 21:51:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 12:51:58 -0700 |
| commit | 7c5e2356f144e065f6099b2bbd6a29cf2d08e263 (patch) | |
| tree | 3fcfaac36d5b73a838512279919a1331756aeecc | |
| parent | 8eda81cc4dfbf9700cd36e280b6ad74d467ed9a3 (diff) | |
| download | vcpkg-7c5e2356f144e065f6099b2bbd6a29cf2d08e263.tar.gz vcpkg-7c5e2356f144e065f6099b2bbd6a29cf2d08e263.zip | |
[openvr] Update to 1.12.5 (#12219)
* [openvr] Update to 1.12.5
https://github.com/ValveSoftware/openvr/releases/tag/v1.12.5
* [openvr] Fix static build faillure
* [openvr] revert aa222ad9f8fdc040dc5929138d9ed3c09ca215cd
* [openvr] update ci.baseline.txt
| -rw-r--r-- | ports/openvr/CONTROL | 2 | ||||
| -rw-r--r-- | ports/openvr/portfile.cmake | 9 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 3 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ports/openvr/CONTROL b/ports/openvr/CONTROL index ada8687b5..bf99e3907 100644 --- a/ports/openvr/CONTROL +++ b/ports/openvr/CONTROL @@ -1,5 +1,5 @@ Source: openvr -Version: 1.10.30 +Version: 1.12.5 Homepage: https://github.com/ValveSoftware/openvr Description: an API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting. Supports: !(arm|uwp|osx|android)
\ No newline at end of file diff --git a/ports/openvr/portfile.cmake b/ports/openvr/portfile.cmake index 0fb02dde1..207bd0f01 100644 --- a/ports/openvr/portfile.cmake +++ b/ports/openvr/portfile.cmake @@ -1,15 +1,14 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "osx") +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ValveSoftware/openvr - REF 26fa19eb86ab3c589af2bdbc77449d61a8ff799b # v1.10.30 - SHA512 821e113c6a847a244cd138869b5c8192c67054e6b8d39c0764d4e88f7a839146e9d9ec1f189cd5566f8954ad07ee0c86cbf8d353806c9bceb0f0a45def1a0ca2 + REF 3a010f0f668d8de59fcba75b14e08a6a08ec68a0 # v1.12.5 + SHA512 a96b8d4bceb23cea64b8f276a4ec70a5ac2a09ec317da37561bf55527bbf3dda2423b4f7323ed93301384c387061498f6089ae1ef50ad6ff77f46f0af662ccd3 HEAD_REF master ) -set(VCPKG_LIBRARY_LINKAGE dynamic) - if(VCPKG_TARGET_IS_WINDOWS) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(ARCH_PATH "win64") @@ -38,4 +37,4 @@ file(COPY ${SOURCE_PATH}/bin/${ARCH_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/d file(INSTALL ${SOURCE_PATH}/headers DESTINATION ${CURRENT_PACKAGES_DIR} RENAME include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 4ae2000d5..bc4657f48 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1302,6 +1302,7 @@ openvr:arm64-windows=fail openvr:arm-uwp=fail openvr:x64-osx=fail openvr:x64-uwp=fail +openvr:x64-windows-static=fail openxr-loader:arm64-windows=fail openxr-loader:arm-uwp=fail openxr-loader:x64-osx=fail @@ -1950,4 +1951,4 @@ ctp:x64-windows=skip ctp:x64-windows-static=skip ctp:x86-windows=skip protozero:arm-uwp=fail -protozero:x64-uwp=fail +protozero:x64-uwp=fail
\ No newline at end of file |