From 1b7b8146891d6a0664cddc41c6b46e43052d0977 Mon Sep 17 00:00:00 2001
From: Tsukasa Sugiura <t.sugiura0204@gmail.com>
Date: Thu, 17 Aug 2017 00:05:05 +0900
Subject: Dynamic path convert

Dynamic path convert of Kinect SDK directory in patch file.
---
 ports/openni2/portfile.cmake                       | 17 +++--
 ports/openni2/replace_environment_variable.patch   | 76 ----------------------
 .../openni2/replace_environment_variable.patch.in  | 76 ++++++++++++++++++++++
 3 files changed, 86 insertions(+), 83 deletions(-)
 delete mode 100644 ports/openni2/replace_environment_variable.patch
 create mode 100644 ports/openni2/replace_environment_variable.patch.in

diff --git a/ports/openni2/portfile.cmake b/ports/openni2/portfile.cmake
index 5b832eaa4..7c15b40ec 100644
--- a/ports/openni2/portfile.cmake
+++ b/ports/openni2/portfile.cmake
@@ -36,6 +36,15 @@ vcpkg_download_distfile(ARCHIVE
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
+get_filename_component(KINECTSDK10_DIR "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Kinect;SDKInstallPath]" ABSOLUTE CACHE)
+set(KINECTSDK10_INSTALLED FALSE)
+if(EXISTS "${KINECTSDK10_DIR}")
+    set(KINECTSDK10_INSTALLED TRUE)
+endif()
+
+file(TO_NATIVE_PATH ${KINECTSDK10_DIR} KINECTSDK10_DIR)
+configure_file("${CMAKE_CURRENT_LIST_DIR}/replace_environment_variable.patch.in" "${CMAKE_CURRENT_LIST_DIR}/replace_environment_variable.patch" @ONLY)
+
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
     PATCHES "${CMAKE_CURRENT_LIST_DIR}/upgrade_projects.patch"
@@ -43,12 +52,6 @@ vcpkg_apply_patches(
             "${CMAKE_CURRENT_LIST_DIR}/replace_environment_variable.patch"
 )
 
-get_filename_component(KINECTSDK10_DIR "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Kinect;SDKInstallPath]" ABSOLUTE CACHE)
-set(KINECTSDK10_INSTALLED FALSE)
-if(EXISTS "${KINECTSDK10_DIR}")
-    set(KINECTSDK10_INSTALLED TRUE)
-endif()
-
 if(NOT ${KINECTSDK10_INSTALLED})
     vcpkg_apply_patches(
         SOURCE_PATH ${SOURCE_PATH}
@@ -240,7 +243,7 @@ file(
         "${SOURCE_BIN_PATH_RELEASE}/PS1080Console.exe"
         "${SOURCE_BIN_PATH_RELEASE}/PSLinkConsole.exe"
     DESTINATION
-        ${CURRENT_PACKAGES_DIR}/tools/openni2/
+        ${CURRENT_PACKAGES_DIR}/tools/openni2
 )
 
 # Handle copyright
diff --git a/ports/openni2/replace_environment_variable.patch b/ports/openni2/replace_environment_variable.patch
deleted file mode 100644
index a5bfe2a54..000000000
--- a/ports/openni2/replace_environment_variable.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/Source/Drivers/Kinect/Kinect.vcxproj b/Source/Drivers/Kinect/Kinect.vcxproj
-index 08a49fe..7fd8620 100644
---- a/Source/Drivers/Kinect/Kinect.vcxproj
-+++ b/Source/Drivers/Kinect/Kinect.vcxproj
-@@ -101,7 +101,7 @@
-     <ClCompile>
-       <WarningLevel>Level3</WarningLevel>
-       <Optimization>Disabled</Optimization>
--      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc;</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;C:\Program Files\Microsoft SDKs\Kinect\v1.8\inc;</AdditionalIncludeDirectories>
-       <PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions);_WINDOWS</PreprocessorDefinitions>
-       <DisableLanguageExtensions>false</DisableLanguageExtensions>
-       <TreatWarningAsError>false</TreatWarningAsError>
-@@ -109,7 +109,7 @@
-     <Link>
-       <GenerateDebugInformation>true</GenerateDebugInformation>
-       <AdditionalDependencies>Kinect10.lib;XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
--      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;$(KINECTSDK10_DIR)\lib\x86;</AdditionalLibraryDirectories>
-+      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;C:\Program Files\Microsoft SDKs\Kinect\v1.8\lib\x86;</AdditionalLibraryDirectories>
-       <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
-     </Link>
-   </ItemDefinitionGroup>
-@@ -117,7 +117,7 @@
-     <ClCompile>
-       <WarningLevel>Level3</WarningLevel>
-       <Optimization>Disabled</Optimization>
--      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc;</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;C:\Program Files\Microsoft SDKs\Kinect\v1.8\inc;</AdditionalIncludeDirectories>
-       <PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions);_WINDOWS</PreprocessorDefinitions>
-       <DisableLanguageExtensions>false</DisableLanguageExtensions>
-       <TreatWarningAsError>false</TreatWarningAsError>
-@@ -125,7 +125,7 @@
-     <Link>
-       <GenerateDebugInformation>true</GenerateDebugInformation>
-       <AdditionalDependencies>Kinect10.lib;XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
--      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;$(KINECTSDK10_DIR)\lib\amd64;</AdditionalLibraryDirectories>
-+      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;C:\Program Files\Microsoft SDKs\Kinect\v1.8\lib\amd64;</AdditionalLibraryDirectories>
-       <IgnoreSpecificDefaultLibraries>
-       </IgnoreSpecificDefaultLibraries>
-       <IgnoreAllDefaultLibraries>
-@@ -139,7 +139,7 @@
-       <Optimization>MaxSpeed</Optimization>
-       <FunctionLevelLinking>true</FunctionLevelLinking>
-       <IntrinsicFunctions>true</IntrinsicFunctions>
--      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc;</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;C:\Program Files\Microsoft SDKs\Kinect\v1.8\inc;</AdditionalIncludeDirectories>
-       <TreatWarningAsError>false</TreatWarningAsError>
-     </ClCompile>
-     <Link>
-@@ -147,7 +147,7 @@
-       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-       <OptimizeReferences>true</OptimizeReferences>
-       <AdditionalDependencies>Kinect10.lib;XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
--      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;$(KINECTSDK10_DIR)\lib\x86;</AdditionalLibraryDirectories>
-+      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;C:\Program Files\Microsoft SDKs\Kinect\v1.8\lib\x86;</AdditionalLibraryDirectories>
-       <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
-     </Link>
-   </ItemDefinitionGroup>
-@@ -157,7 +157,7 @@
-       <Optimization>MaxSpeed</Optimization>
-       <FunctionLevelLinking>true</FunctionLevelLinking>
-       <IntrinsicFunctions>true</IntrinsicFunctions>
--      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc;</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;C:\Program Files\Microsoft SDKs\Kinect\v1.8\inc;</AdditionalIncludeDirectories>
-       <TreatWarningAsError>false</TreatWarningAsError>
-     </ClCompile>
-     <Link>
-@@ -165,7 +165,7 @@
-       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-       <OptimizeReferences>true</OptimizeReferences>
-       <AdditionalDependencies>Kinect10.lib;XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
--      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;$(KINECTSDK10_DIR)\lib\amd64;</AdditionalLibraryDirectories>
-+      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;C:\Program Files\Microsoft SDKs\Kinect\v1.8\lib\amd64;</AdditionalLibraryDirectories>
-       <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
-     </Link>
-   </ItemDefinitionGroup>
diff --git a/ports/openni2/replace_environment_variable.patch.in b/ports/openni2/replace_environment_variable.patch.in
new file mode 100644
index 000000000..25abe7edf
--- /dev/null
+++ b/ports/openni2/replace_environment_variable.patch.in
@@ -0,0 +1,76 @@
+diff --git a/Source/Drivers/Kinect/Kinect.vcxproj b/Source/Drivers/Kinect/Kinect.vcxproj
+index 08a49fe..7fd8620 100644
+--- a/Source/Drivers/Kinect/Kinect.vcxproj
++++ b/Source/Drivers/Kinect/Kinect.vcxproj
+@@ -101,7 +101,7 @@
+     <ClCompile>
+       <WarningLevel>Level3</WarningLevel>
+       <Optimization>Disabled</Optimization>
+-      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc;</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;@KINECTSDK10_DIR@\inc;</AdditionalIncludeDirectories>
+       <PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions);_WINDOWS</PreprocessorDefinitions>
+       <DisableLanguageExtensions>false</DisableLanguageExtensions>
+       <TreatWarningAsError>false</TreatWarningAsError>
+@@ -109,7 +109,7 @@
+     <Link>
+       <GenerateDebugInformation>true</GenerateDebugInformation>
+       <AdditionalDependencies>Kinect10.lib;XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+-      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;$(KINECTSDK10_DIR)\lib\x86;</AdditionalLibraryDirectories>
++      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;@KINECTSDK10_DIR@\lib\x86;</AdditionalLibraryDirectories>
+       <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
+     </Link>
+   </ItemDefinitionGroup>
+@@ -117,7 +117,7 @@
+     <ClCompile>
+       <WarningLevel>Level3</WarningLevel>
+       <Optimization>Disabled</Optimization>
+-      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc;</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;@KINECTSDK10_DIR@\inc;</AdditionalIncludeDirectories>
+       <PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions);_WINDOWS</PreprocessorDefinitions>
+       <DisableLanguageExtensions>false</DisableLanguageExtensions>
+       <TreatWarningAsError>false</TreatWarningAsError>
+@@ -125,7 +125,7 @@
+     <Link>
+       <GenerateDebugInformation>true</GenerateDebugInformation>
+       <AdditionalDependencies>Kinect10.lib;XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+-      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;$(KINECTSDK10_DIR)\lib\amd64;</AdditionalLibraryDirectories>
++      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;@KINECTSDK10_DIR@\lib\amd64;</AdditionalLibraryDirectories>
+       <IgnoreSpecificDefaultLibraries>
+       </IgnoreSpecificDefaultLibraries>
+       <IgnoreAllDefaultLibraries>
+@@ -139,7 +139,7 @@
+       <Optimization>MaxSpeed</Optimization>
+       <FunctionLevelLinking>true</FunctionLevelLinking>
+       <IntrinsicFunctions>true</IntrinsicFunctions>
+-      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc;</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;@KINECTSDK10_DIR@\inc;</AdditionalIncludeDirectories>
+       <TreatWarningAsError>false</TreatWarningAsError>
+     </ClCompile>
+     <Link>
+@@ -147,7 +147,7 @@
+       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+       <OptimizeReferences>true</OptimizeReferences>
+       <AdditionalDependencies>Kinect10.lib;XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+-      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;$(KINECTSDK10_DIR)\lib\x86;</AdditionalLibraryDirectories>
++      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;@KINECTSDK10_DIR@\lib\x86;</AdditionalLibraryDirectories>
+       <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
+     </Link>
+   </ItemDefinitionGroup>
+@@ -157,7 +157,7 @@
+       <Optimization>MaxSpeed</Optimization>
+       <FunctionLevelLinking>true</FunctionLevelLinking>
+       <IntrinsicFunctions>true</IntrinsicFunctions>
+-      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc;</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;@KINECTSDK10_DIR@\inc;</AdditionalIncludeDirectories>
+       <TreatWarningAsError>false</TreatWarningAsError>
+     </ClCompile>
+     <Link>
+@@ -165,7 +165,7 @@
+       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+       <OptimizeReferences>true</OptimizeReferences>
+       <AdditionalDependencies>Kinect10.lib;XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+-      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;$(KINECTSDK10_DIR)\lib\amd64;</AdditionalLibraryDirectories>
++      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;@KINECTSDK10_DIR@\lib\amd64;</AdditionalLibraryDirectories>
+       <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
+     </Link>
+   </ItemDefinitionGroup>
-- 
cgit v1.2.3