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 af2928cc50d38e807e7ed22acd485c54bed53290..49a5ec25b1e7e9320abb757c86126a20e795969f 100644 (file)
--- a/vs2015/package/package.vcxproj
+++ b/vs2015/package/package.vcxproj
@@ -45,7 +45,7 @@
       <Project>{d7411b2c-2c43-434d-9f56-e10a3d2f5bad}</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 6b5930e8fe642f30f800428677f0ba58b3a5ec50..f4577f95e62f395f487f8ab99a2abcebc8e389cc 100644 (file)
--- a/vs2017/package/package.vcxproj
+++ b/vs2017/package/package.vcxproj
@@ -45,7 +45,7 @@
       <Project>{d7411b2c-2c43-434d-9f56-e10a3d2f5bad}</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>