diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index f562d349fe..dbcf614877 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -15,6 +15,7 @@ <_ZVcpkgRoot>$(VcpkgRoot) <_ZVcpkgManifestRoot>$(VcpkgManifestRoot) <_ZVcpkgInstalledDir>$(VcpkgInstalledDir) + <_ZVcpkgManifestInstalledBaseDir>$(VcpkgManifestInstalledBaseDir) @@ -22,6 +23,7 @@ <_ZVcpkgRoot Condition="!$(_ZVcpkgRoot.EndsWith('\'))">$(_ZVcpkgRoot)\ <_ZVcpkgManifestRoot Condition="'$(_ZVcpkgManifestRoot)' != '' and !$(_ZVcpkgManifestRoot.EndsWith('\'))">$(_ZVcpkgManifestRoot)\ <_ZVcpkgInstalledDir Condition="'$(_ZVcpkgInstalledDir)' != '' and !$(_ZVcpkgInstalledDir.EndsWith('\'))">$(_ZVcpkgInstalledDir)\ + <_ZVcpkgManifestInstalledBaseDir Condition="'$(_ZVcpkgManifestInstalledBaseDir)' != '' and !$(_ZVcpkgManifestInstalledBaseDir.EndsWith('\'))">$(_ZVcpkgManifestInstalledBaseDir)\ @@ -71,12 +73,14 @@ VcpkgTriplet=$(VcpkgTriplet):$(ProjectStateLine) - + - <_ZVcpkgInstalledDir Condition="'$(_ZVcpkgInstalledDir)' == ''">$(_ZVcpkgManifestRoot)vcpkg_installed\$(VcpkgTriplet)\ + <_ZVcpkgManifestInstalledBaseDir Condition="'$(_ZVcpkgManifestInstalledBaseDir)' == ''">$(_ZVcpkgManifestRoot)vcpkg_installed\ + <_ZVcpkgInstalledDir Condition="'$(_ZVcpkgInstalledDir)' == ''">$(_ZVcpkgManifestInstalledBaseDir)$(VcpkgTriplet)\