diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2021-02-11 10:09:36 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-11 10:09:36 -0800 |
| commit | 5e4d04ecd59d683a33b4b3b9679abc5becc5f272 (patch) | |
| tree | 8c8e04c036e519582db05a7ccbb8769ae2af78f2 /scripts | |
| parent | d264b0eb1d94c481abc74bcfcb0605a980531e07 (diff) | |
| download | vcpkg-5e4d04ecd59d683a33b4b3b9679abc5becc5f272.tar.gz vcpkg-5e4d04ecd59d683a33b4b3b9679abc5becc5f272.zip | |
[vcpkg_build_msbuild] Hotfix regression in #16173 (#16180)
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_build_msbuild.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/cmake/vcpkg_build_msbuild.cmake b/scripts/cmake/vcpkg_build_msbuild.cmake index a19f73dce..799eb33b5 100644 --- a/scripts/cmake/vcpkg_build_msbuild.cmake +++ b/scripts/cmake/vcpkg_build_msbuild.cmake @@ -99,6 +99,7 @@ function(vcpkg_build_msbuild) /p:UseIntelMKL=No /p:WindowsTargetPlatformVersion=${_csc_TARGET_PLATFORM_VERSION} /p:VcpkgManifestInstall=false + /p:VcpkgManifestEnabled=false /m ) @@ -113,8 +114,10 @@ function(vcpkg_build_msbuild) APPEND _csc_OPTIONS /p:ForceImportBeforeCppTargets=${SCRIPTS}/buildsystems/msbuild/vcpkg.targets "/p:VcpkgTriplet=${TARGET_TRIPLET}" - "/p:VcpkgCurrentInstalledDir=${CURRENT_INSTALLED_DIR}" + "/p:VcpkgInstalledDir=${_VCPKG_INSTALLED_DIR}" ) + else() + list(APPEND _csc_OPTIONS "/p:VcpkgEnabled=false") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") |