diff options
| author | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
|---|---|---|
| committer | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
| commit | 788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b (patch) | |
| tree | 173ade0e6960917458afe9dd9fb0c3c2b7f32051 /ports/openni2 | |
| parent | f483ae4c7fd04eed671a1de595374f84175311e9 (diff) | |
| parent | 26a9338c5055193915290527eacb37f2ac7fdcb8 (diff) | |
| download | vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.tar.gz vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.zip | |
Merge master
Diffstat (limited to 'ports/openni2')
| -rw-r--r-- | ports/openni2/CONTROL | 8 | ||||
| -rw-r--r-- | ports/openni2/portfile.cmake | 17 |
2 files changed, 7 insertions, 18 deletions
diff --git a/ports/openni2/CONTROL b/ports/openni2/CONTROL index 26fcebaba..d7e75fb7d 100644 --- a/ports/openni2/CONTROL +++ b/ports/openni2/CONTROL @@ -1,4 +1,4 @@ -Source: openni2 -Version: 2.2.0.33-7 -Build-Depends: kinectsdk1 -Description: OpenNI is open source library for access to Natural Interaction (NI) devices such as RGB-D camera. +Source: openni2
+Version: 2.2.0.33-8
+Build-Depends: kinectsdk1
+Description: OpenNI is open source library for access to Natural Interaction (NI) devices such as RGB-D camera.
diff --git a/ports/openni2/portfile.cmake b/ports/openni2/portfile.cmake index fb7eeade6..8ef2514b3 100644 --- a/ports/openni2/portfile.cmake +++ b/ports/openni2/portfile.cmake @@ -1,21 +1,10 @@ -# UWP Not Support +include(vcpkg_common_functions) if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") message(FATAL_ERROR "Error: UWP builds are currently not supported.") endif() -# Static Build Not Support -if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - message(STATUS "Warning: Static building not supported. Building dynamic.") - set(VCPKG_LIBRARY_LINKAGE "dynamic") -endif() +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) -# Static CRT linkage not supported -if (VCPKG_CRT_LINKAGE STREQUAL "static") - message(FATAL_ERROR "Warning: Static CRT linkage is not supported.") -endif() - -# Download Source Code -include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenNI/OpenNI2 @@ -223,4 +212,4 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/openni2deploy.ps1 DESTINATION ${CURRENT_PACK # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openni2) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/openni2/LICENSE ${CURRENT_PACKAGES_DIR}/share/openni2/copyright)
\ No newline at end of file +file(RENAME ${CURRENT_PACKAGES_DIR}/share/openni2/LICENSE ${CURRENT_PACKAGES_DIR}/share/openni2/copyright) |