[openni2] Fix patch. Disable kinect optional component. Move headers.

2 files changed, 34 insertions, 89 deletions

diff --git a/ports/openni2/portfile.cmake b/ports/openni2/portfile.cmake
index 5d798e195..12ac4902b 100644
--- a/ports/openni2/portfile.cmake
+++ b/ports/openni2/portfile.cmake
@@ -21,6 +21,11 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     set(VCPKG_LIBRARY_LINKAGE "dynamic")
 endif()
 
+# 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)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/OpenNI2-2.2-beta2)
@@ -31,24 +36,12 @@ vcpkg_download_distfile(ARCHIVE
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
-# Apply Patches
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
     PATCHES "${CMAKE_CURRENT_LIST_DIR}/upgrade_projects.patch"
+    PATCHES "${CMAKE_CURRENT_LIST_DIR}/disable_kinect.patch"
 )
 
-set(KINECTSDK10_INSTALLED FALSE)
-if(EXISTS "$ENV{KINECTSDK10_DIR}/inc/NuiApi.h")
-    set(KINECTSDK10_INSTALLED TRUE)
-endif()
-
-if(NOT ${KINECTSDK10_INSTALLED})
-    vcpkg_apply_patches(
-        SOURCE_PATH ${SOURCE_PATH}
-        PATCHES "${CMAKE_CURRENT_LIST_DIR}/disable_kinect.patch"
-    )
-endif()
-
 # Build OpenNI2
 vcpkg_build_msbuild(
     PROJECT_PATH "${SOURCE_PATH}/OpenNI.sln"
@@ -71,7 +64,7 @@ file(
     INSTALL
         "${SOURCE_INCLUDE_PATH}/Android-Arm/OniPlatformAndroid-Arm.h"
     DESTINATION
-        ${CURRENT_PACKAGES_DIR}/include/Android-Arm
+        ${CURRENT_PACKAGES_DIR}/include/openni2/Android-Arm
 )
 
 file(
@@ -79,35 +72,35 @@ file(
         "${SOURCE_INCLUDE_PATH}/Driver/OniDriverAPI.h"
         "${SOURCE_INCLUDE_PATH}/Driver/OniDriverTypes.h"
     DESTINATION
-        ${CURRENT_PACKAGES_DIR}/include/Driver
+        ${CURRENT_PACKAGES_DIR}/include/openni2/Driver
 )
 
 file(
     INSTALL
         "${SOURCE_INCLUDE_PATH}/Linux-Arm/OniPlatformLinux-Arm.h"
     DESTINATION
-        ${CURRENT_PACKAGES_DIR}/include/Linux-Arm
+        ${CURRENT_PACKAGES_DIR}/include/openni2/Linux-Arm
 )
 
 file(
     INSTALL
         "${SOURCE_INCLUDE_PATH}/Linux-x86/OniPlatformLinux-x86.h"
     DESTINATION
-        ${CURRENT_PACKAGES_DIR}/include/Linux-x86
+        ${CURRENT_PACKAGES_DIR}/include/openni2/Linux-x86
 )
 
 file(
     INSTALL
         "${SOURCE_INCLUDE_PATH}/MacOSX/OniPlatformMacOSX.h"
     DESTINATION
-        ${CURRENT_PACKAGES_DIR}/include/MacOSX
+        ${CURRENT_PACKAGES_DIR}/include/openni2/MacOSX
 )
 
 file(
     INSTALL
         "${SOURCE_INCLUDE_PATH}/Win32/OniPlatformWin32.h"
     DESTINATION
-        ${CURRENT_PACKAGES_DIR}/include/Win32
+        ${CURRENT_PACKAGES_DIR}/include/openni2/Win32
 )
 
 file(
@@ -125,7 +118,7 @@ file(
         "${SOURCE_INCLUDE_PATH}/PS1080.h"
         "${SOURCE_INCLUDE_PATH}/PSLink.h"
     DESTINATION
-        ${CURRENT_PACKAGES_DIR}/include
+        ${CURRENT_PACKAGES_DIR}/include/openni2
 )
 
 file(
@@ -153,15 +146,6 @@ file(
         ${CURRENT_PACKAGES_DIR}/bin/OpenNI2/Drivers
 )
 
-if(${KINECTSDK10_INSTALLED})
-    file(
-        INSTALL
-            "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/Kinect.dll"
-        DESTINATION
-            ${CURRENT_PACKAGES_DIR}/bin/OpenNI2/Drivers
-    )
-endif()
-
 file(
     INSTALL
         "${SOURCE_CONFIG_PATH}/OpenNI.ini"
@@ -181,15 +165,6 @@ file(
         ${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2/Drivers
 )
 
-if(${KINECTSDK10_INSTALLED})
-    file(
-        INSTALL
-            "${SOURCE_BIN_PATH_DEBUG}/OpenNI2/Drivers/Kinect.dll"
-        DESTINATION
-            ${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2/Drivers
-    )
-endif()
-
 file(
     INSTALL
         "${SOURCE_CONFIG_PATH}/OpenNI.ini"
@@ -209,15 +184,6 @@ file(
         ${CURRENT_PACKAGES_DIR}/tools/openni2/OpenNI2/Drivers
 )
 
-if(${KINECTSDK10_INSTALLED})
-    file(
-        INSTALL
-            "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/Kinect.dll"
-        DESTINATION
-            ${CURRENT_PACKAGES_DIR}/tools/openni2/OpenNI2/Drivers
-    )
-endif()
-
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
     set(NUMBEROFBIT 32)
 elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
diff --git a/ports/openni2/upgrade_projects.patch b/ports/openni2/upgrade_projects.patch
index c1d23b72f..1a44381b0 100644
--- a/ports/openni2/upgrade_projects.patch
+++ b/ports/openni2/upgrade_projects.patch
@@ -2,8 +2,7 @@ diff --git a/Samples/ClosestPointViewer/ClosestPointViewer.vcxproj b/Samples/Clo
 index fe63dbf..6050e8f 100644
 --- a/Samples/ClosestPointViewer/ClosestPointViewer.vcxproj
 +++ b/Samples/ClosestPointViewer/ClosestPointViewer.vcxproj
-@@ -1,5 +1,5 @@
- ・ｿ<?xml version="1.0" encoding="utf-8"?>
+@@ -2,4 +2,4 @@
 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
@@ -85,8 +84,7 @@ diff --git a/Samples/EventBasedRead/EventBasedRead.vcxproj b/Samples/EventBasedR
 index f67db7a..ffe19ac 100644
 --- a/Samples/EventBasedRead/EventBasedRead.vcxproj
 +++ b/Samples/EventBasedRead/EventBasedRead.vcxproj
-@@ -1,5 +1,5 @@
- ・ｿ<?xml version="1.0" encoding="utf-8"?>
+@@ -2,4 +2,4 @@
 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
@@ -160,8 +158,7 @@ diff --git a/Samples/MWClosestPoint/MWClosestPoint.vcxproj b/Samples/MWClosestPo
 index 74cafe7..5844506 100644
 --- a/Samples/MWClosestPoint/MWClosestPoint.vcxproj
 +++ b/Samples/MWClosestPoint/MWClosestPoint.vcxproj
-@@ -1,5 +1,5 @@
- ・ｿ<?xml version="1.0" encoding="utf-8"?>
+@@ -2,4 +2,4 @@
 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
@@ -235,8 +232,7 @@ diff --git a/Samples/MWClosestPointApp/MWClosestPointApp.vcxproj b/Samples/MWClo
 index 063ec37..deb7c17 100644
 --- a/Samples/MWClosestPointApp/MWClosestPointApp.vcxproj
 +++ b/Samples/MWClosestPointApp/MWClosestPointApp.vcxproj
-@@ -1,5 +1,5 @@
- ・ｿ<?xml version="1.0" encoding="utf-8"?>
+@@ -2,4 +2,4 @@
 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
@@ -310,8 +306,7 @@ diff --git a/Samples/MultiDepthViewer/MultiDepthViewer.vcxproj b/Samples/MultiDe
 index d021c0d..85a0d4f 100644
 --- a/Samples/MultiDepthViewer/MultiDepthViewer.vcxproj
 +++ b/Samples/MultiDepthViewer/MultiDepthViewer.vcxproj
-@@ -1,5 +1,5 @@
- ・ｿ<?xml version="1.0" encoding="utf-8"?>
+@@ -2,4 +2,4 @@
 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
@@ -393,8 +388,7 @@ diff --git a/Samples/MultipleStreamRead/MultipleStreamRead.vcxproj b/Samples/Mul
 index 15887ec..5fa8202 100644
 --- a/Samples/MultipleStreamRead/MultipleStreamRead.vcxproj
 +++ b/Samples/MultipleStreamRead/MultipleStreamRead.vcxproj
-@@ -1,5 +1,5 @@
- ・ｿ<?xml version="1.0" encoding="utf-8"?>
+@@ -2,4 +2,4 @@
 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
@@ -468,8 +462,7 @@ diff --git a/Samples/SimpleRead/SimpleRead.vcxproj b/Samples/SimpleRead/SimpleRe
 index de3942f..6ce41e3 100644
 --- a/Samples/SimpleRead/SimpleRead.vcxproj
 +++ b/Samples/SimpleRead/SimpleRead.vcxproj
-@@ -1,5 +1,5 @@
- ・ｿ<?xml version="1.0" encoding="utf-8"?>
+@@ -2,4 +2,4 @@
 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
@@ -543,8 +536,7 @@ diff --git a/Samples/SimpleViewer/SimpleViewer.vcxproj b/Samples/SimpleViewer/Si
 index d693a1d..40621e1 100644
 --- a/Samples/SimpleViewer/SimpleViewer.vcxproj
 +++ b/Samples/SimpleViewer/SimpleViewer.vcxproj
-@@ -1,5 +1,5 @@
- ・ｿ<?xml version="1.0" encoding="utf-8"?>
+@@ -2,4 +2,4 @@
 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
@@ -626,8 +618,7 @@ diff --git a/Source/Core/OpenNI.vcxproj b/Source/Core/OpenNI.vcxproj
 index 12189de..f176682 100644
 --- a/Source/Core/OpenNI.vcxproj
 +++ b/Source/Core/OpenNI.vcxproj
-@@ -1,5 +1,5 @@
- ・ｿ<?xml version="1.0" encoding="utf-8"?>
+@@ -2,4 +2,4 @@
 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
@@ -701,8 +692,7 @@ diff --git a/Source/DepthUtils/DepthUtils.vcxproj b/Source/DepthUtils/DepthUtils
 index dcab0b7..e474661 100644
 --- a/Source/DepthUtils/DepthUtils.vcxproj
 +++ b/Source/DepthUtils/DepthUtils.vcxproj
-@@ -1,5 +1,5 @@
- ・ｿ<?xml version="1.0" encoding="utf-8"?>
+@@ -2,4 +2,4 @@
 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
@@ -776,8 +766,7 @@ diff --git a/Source/Drivers/DummyDevice/DummyDevice.vcxproj b/Source/Drivers/Dum
 index 56c5944..0401f3d 100644
 --- a/Source/Drivers/DummyDevice/DummyDevice.vcxproj
 +++ b/Source/Drivers/DummyDevice/DummyDevice.vcxproj
-@@ -1,5 +1,5 @@
- ・ｿ<?xml version="1.0" encoding="utf-8"?>
+@@ -2,4 +2,4 @@
 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
@@ -851,8 +840,7 @@ diff --git a/Source/Drivers/Kinect/Kinect.vcxproj b/Source/Drivers/Kinect/Kinect
 index f54e8b2..7f54d04 100644
 --- a/Source/Drivers/Kinect/Kinect.vcxproj
 +++ b/Source/Drivers/Kinect/Kinect.vcxproj
-@@ -1,5 +1,5 @@
- ・ｿ<?xml version="1.0" encoding="utf-8"?>
+@@ -2,4 +2,4 @@
 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
@@ -929,8 +917,7 @@ diff --git a/Source/Drivers/OniFile/OniFile.vcxproj b/Source/Drivers/OniFile/Oni
 index 9b173f7..e2f4391 100644
 --- a/Source/Drivers/OniFile/OniFile.vcxproj
 +++ b/Source/Drivers/OniFile/OniFile.vcxproj
-@@ -1,5 +1,5 @@
- ・ｿ<?xml version="1.0" encoding="utf-8"?>
+@@ -2,4 +2,4 @@
 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
@@ -1004,8 +991,7 @@ diff --git a/Source/Drivers/PS1080/PS1080.vcxproj b/Source/Drivers/PS1080/PS1080
 index 2a1154d..8495c28 100644
 --- a/Source/Drivers/PS1080/PS1080.vcxproj
 +++ b/Source/Drivers/PS1080/PS1080.vcxproj
-@@ -1,5 +1,5 @@
- ・ｿ<?xml version="1.0" encoding="utf-8"?>
+@@ -2,4 +2,4 @@
 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
@@ -1079,8 +1065,7 @@ diff --git a/Source/Drivers/PS1080/PS1080Console/PS1080Console.vcxproj b/Source/
 index b9adfea..7446d5a 100644
 --- a/Source/Drivers/PS1080/PS1080Console/PS1080Console.vcxproj
 +++ b/Source/Drivers/PS1080/PS1080Console/PS1080Console.vcxproj
-@@ -1,5 +1,5 @@
- ・ｿ<?xml version="1.0" encoding="utf-8"?>
+@@ -2,4 +2,4 @@
 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
@@ -1159,8 +1144,7 @@ diff --git a/Source/Drivers/PSLink/PSLink.vcxproj b/Source/Drivers/PSLink/PSLink
 index 8915163..68a7e96 100644
 --- a/Source/Drivers/PSLink/PSLink.vcxproj
 +++ b/Source/Drivers/PSLink/PSLink.vcxproj
-@@ -1,5 +1,5 @@
- ・ｿ<?xml version="1.0" encoding="utf-8"?>
+@@ -2,4 +2,4 @@
 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
@@ -1239,8 +1223,7 @@ diff --git a/Source/Drivers/PSLink/PSLinkConsole/PSLinkConsole.vcxproj b/Source/
 index e6c7c8c..26ff9c8 100644
 --- a/Source/Drivers/PSLink/PSLinkConsole/PSLinkConsole.vcxproj
 +++ b/Source/Drivers/PSLink/PSLinkConsole/PSLinkConsole.vcxproj
-@@ -1,5 +1,5 @@
- ・ｿ<?xml version="1.0" encoding="utf-8"?>
+@@ -2,4 +2,4 @@
 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
@@ -1319,8 +1302,7 @@ diff --git a/Source/Drivers/TestDevice/TestDevice.vcxproj b/Source/Drivers/TestD
 index e20a074..3777b2e 100644
 --- a/Source/Drivers/TestDevice/TestDevice.vcxproj
 +++ b/Source/Drivers/TestDevice/TestDevice.vcxproj
-@@ -1,5 +1,5 @@
- ・ｿ<?xml version="1.0" encoding="utf-8"?>
+@@ -2,4 +2,4 @@
 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
@@ -1394,8 +1376,7 @@ diff --git a/Source/Tools/NiViewer/NiViewer.vcxproj b/Source/Tools/NiViewer/NiVi
 index 0a4c392..e331009 100644
 --- a/Source/Tools/NiViewer/NiViewer.vcxproj
 +++ b/Source/Tools/NiViewer/NiViewer.vcxproj
-@@ -1,5 +1,5 @@
- ・ｿ<?xml version="1.0" encoding="utf-8"?>
+@@ -2,4 +2,4 @@
 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
@@ -1477,8 +1458,7 @@ diff --git a/ThirdParty/PSCommon/XnLib/Source/XnLib.vcxproj b/ThirdParty/PSCommo
 index 2761222..f2094b3 100644
 --- a/ThirdParty/PSCommon/XnLib/Source/XnLib.vcxproj
 +++ b/ThirdParty/PSCommon/XnLib/Source/XnLib.vcxproj
-@@ -1,5 +1,5 @@
- ・ｿ<?xml version="1.0" encoding="utf-8"?>
+@@ -2,4 +2,4 @@
 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">
@@ -1552,8 +1532,7 @@ diff --git a/Wrappers/java/OpenNI.jni/OpenNI.jni.vcxproj b/Wrappers/java/OpenNI.
 index b95c484..bfd0503 100644
 --- a/Wrappers/java/OpenNI.jni/OpenNI.jni.vcxproj
 +++ b/Wrappers/java/OpenNI.jni/OpenNI.jni.vcxproj
-@@ -1,5 +1,5 @@
- ・ｿ<?xml version="1.0" encoding="utf-8"?>
+@@ -2,4 +2,4 @@
 -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    <ItemGroup Label="ProjectConfigurations">