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 ad6b84fce9118e83490d397f131a42c513d8ff2d..7251baaece4eba12b65150a1a338cc1162df51be 100644 (file)
--- a/vs2015/package/package.vcxproj
+++ b/vs2015/package/package.vcxproj
@@ -49,7 +49,7 @@
       <Project>{2E61D2CC-865E-442C-8C83-B8DAFD7BBD3B}</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 ad6b84fce9118e83490d397f131a42c513d8ff2d..7251baaece4eba12b65150a1a338cc1162df51be 100644 (file)
--- a/vs2017/package/package.vcxproj
+++ b/vs2017/package/package.vcxproj
@@ -49,7 +49,7 @@
       <Project>{2E61D2CC-865E-442C-8C83-B8DAFD7BBD3B}</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>