diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-06-28 14:16:48 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-06-28 14:16:57 -0700 |
| commit | a88a904849e03cc807942f78edf06ba7b464b6cd (patch) | |
| tree | 904c64c4a5bc759446cc14db076d91ec21ddfd52 | |
| parent | b64935e67ac6817defd862fc7fbc3a1f4819d79c (diff) | |
| download | vcpkg-a88a904849e03cc807942f78edf06ba7b464b6cd.tar.gz vcpkg-a88a904849e03cc807942f78edf06ba7b464b6cd.zip | |
[kinectsdk1] Move includes to match how the SDK expects them to be included
| -rw-r--r-- | ports/kinectsdk1/CONTROL | 2 | ||||
| -rw-r--r-- | ports/kinectsdk1/portfile.cmake | 16 |
2 files changed, 4 insertions, 14 deletions
diff --git a/ports/kinectsdk1/CONTROL b/ports/kinectsdk1/CONTROL index 21f531425..3d4c83fd2 100644 --- a/ports/kinectsdk1/CONTROL +++ b/ports/kinectsdk1/CONTROL @@ -1,3 +1,3 @@ Source: kinectsdk1 -Version: 1.8 +Version: 1.8-1 Description: Kinect for Windows SDK for Kinect v1 sensor. diff --git a/ports/kinectsdk1/portfile.cmake b/ports/kinectsdk1/portfile.cmake index 61f006492..3df29b3bf 100644 --- a/ports/kinectsdk1/portfile.cmake +++ b/ports/kinectsdk1/portfile.cmake @@ -1,15 +1,3 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg> -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# - include(vcpkg_common_functions) get_filename_component(KINECTSDK10_DIR "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Kinect;SDKInstallPath]" ABSOLUTE CACHE) @@ -24,13 +12,15 @@ file( "${KINECTSDK10_DIR}/inc/NuiSensor.h" "${KINECTSDK10_DIR}/inc/NuiSkeleton.h" DESTINATION - ${CURRENT_PACKAGES_DIR}/include/kinectsdk1 + ${CURRENT_PACKAGES_DIR}/include ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(ARCHITECTURE x86) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(ARCHITECTURE amd64) +else() + message(FATAL_ERROR "This port does not currently support architecture: ${VCPKG_TARGET_ARCHITECTURE}") endif() file( |