Owen Smith
2018-08-14 12:56:34 UTC
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 <***@citrix.com>
---
vs2015/package/package.vcxproj | 2 +-
vs2017/package/package.vcxproj | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/vs2015/package/package.vcxproj b/vs2015/package/package.vcxproj
index af2928c..49a5ec2 100644
--- 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 6b5930e..f4577f9 100644
--- 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>
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 <***@citrix.com>
---
vs2015/package/package.vcxproj | 2 +-
vs2017/package/package.vcxproj | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/vs2015/package/package.vcxproj b/vs2015/package/package.vcxproj
index af2928c..49a5ec2 100644
--- 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 6b5930e..f4577f9 100644
--- 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>
--
2.16.2.windows.1
2.16.2.windows.1