Skip to content

Commit 265691a

Browse files
committed
Merge pull request git-for-windows#1679 from telezhnaya/win
vcxproj: change build logic
2 parents 35c1713 + a738cca commit 265691a

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

contrib/buildsystems/Generators/Vcxproj.pm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,9 @@ sub createProject {
179179
EOM
180180
if ($target eq 'libgit') {
181181
print F << "EOM";
182-
<PreBuildEvent Condition="!Exists('$cdup\\compat\\vcbuild\\vcpkg')">
182+
<PreBuildEvent Condition="!Exists('$cdup\\compat\\vcbuild\\vcpkg') OR (!Exists('$cdup\\compat\\vcbuild\\vcpkg\\installed\\x64-windows\\include\\openssl\\ssl.h') AND !Exists('$cdup\\compat\\vcbuild\\vcpkg\\installed\\x86-windows\\include\\openssl\\ssl.h'))">
183183
<Message>Initialize VCPKG</Message>
184+
<Command>del "$cdup\\compat\\vcbuild\\vcpkg"</Command>
184185
<Command>call "$cdup\\compat\\vcbuild\\vcpkg_install.bat" </Command>
185186
</PreBuildEvent>
186187
EOM

0 commit comments

Comments
 (0)