Try some other ways to compute the vcpkg root

microsoft · Aug 23, 2023 · 053398e · 053398e
1 parent 382461a
commit 053398e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/common.build.post.props b/src/common.build.post.props
@@ -115,9 +115,5 @@
   </ItemDefinitionGroup>
 
   <!-- For C++ projects, bring in the vcpkg targets at the end -->
-  <PropertyGroup>
-    <!-- This must be set before including the targets but after the props -->
-    <VcpkgInstalledDir>$(SolutionDir)\obj\$(Platform)\vcpkg</VcpkgInstalledDir>
-  </PropertyGroup>
   <Import Project="$(VcpkgRoot)/scripts/buildsystems/msbuild/vcpkg.targets" Condition="'$(MSBuildProjectExtension)'=='.vcxproj'" />
 </Project>
diff --git a/src/common.build.pre.props b/src/common.build.pre.props
@@ -254,7 +254,11 @@
       This saves running a powershell script for every project.
     -->
     <VcpkgApplocalDeps>false</VcpkgApplocalDeps>
+    <VcpkgInstalledDir>$(SolutionDir)\obj\$(Platform)\vcpkg</VcpkgInstalledDir>
     <VcpkgRoot Condition="'$(VcpkgRoot)'==''">$(VCPKG_ROOT)</VcpkgRoot>
+    <!-- VsInstallRoot is set by Visual Studio and MSBuild -->
+    <VcpkgRoot Condition="'$(VcpkgRoot)'==''">$(VsInstallRoot)\VC\vcpkg</VcpkgRoot>
+    <VcpkgRoot Condition="'$(VcpkgRoot)'=='' or !Exists('$(VcpkgRoot)\vcpkg.exe')">$(SolutionDir)\dep\vcpkg</VcpkgRoot>
   </PropertyGroup>
 
   <Import Project="$(VcpkgRoot)/scripts/buildsystems/msbuild/vcpkg.props" Condition="'$(MSBuildProjectExtension)'=='.vcxproj'" />