Conditionally package DPInst

Since DPInst.exe is not shipped with the Windows Driver Kit 10, an
environment variable must point to local copies. Make the inclusion of
DPInst conditional on DPINST_REDIST being defined and that path
existing. This simplifies building packages which do not require DPInst
for installation, and removes a required step to create a working build.

Signed-off-by: Owen Smith <owen.smith@citrix.com>

diff --git a/vs2015/package/package.vcxproj b/vs2015/package/package.vcxproj
index d2baa4c763e45765528a11dd9e90201a57f1c510..db5c2e05a46bcf754569ff53e606b3ee3bfecf3b 100644 (file)
--- a/vs2015/package/package.vcxproj
+++ b/vs2015/package/package.vcxproj
@@ -39,7 +39,7 @@
       <Project>{2BFAC7E6-3420-47A5-A092-BDC5C9D78A44}</Project>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition="Exists('$(DPINST_REDIST)')">
     <FilesToPackage Include="$(DPINST_REDIST)\x86\dpinst.exe" Condition="'$(Platform)'=='Win32'" />
     <FilesToPackage Include="$(DPINST_REDIST)\x64\dpinst.exe" Condition="'$(Platform)'=='x64'" />
   </ItemGroup>

diff --git a/vs2017/package/package.vcxproj b/vs2017/package/package.vcxproj
index 3827ea4d14ba84e3528b5f4007bd25fd2a9ceb71..f32de242198f714df4f341dc7691b2dd4764e99b 100644 (file)
--- a/vs2017/package/package.vcxproj
+++ b/vs2017/package/package.vcxproj
@@ -39,7 +39,7 @@
       <Project>{2BFAC7E6-3420-47A5-A092-BDC5C9D78A44}</Project>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition="Exists('$(DPINST_REDIST)')">
     <FilesToPackage Include="$(DPINST_REDIST)\x86\dpinst.exe" Condition="'$(Platform)'=='Win32'" />
     <FilesToPackage Include="$(DPINST_REDIST)\x64\dpinst.exe" Condition="'$(Platform)'=='x64'" />
   </ItemGroup>