mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 19:52:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg_build_msbuild] Hotfix regression in #16173 (#16180)

Browse Source 
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
This commit is contained in:
ras0219 2021-02-11 10:09:36 -08:00 committed by GitHub
parent d264b0eb1d
commit 5e4d04ecd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/cmake/vcpkg_build_msbuild.cmake
View File

@ -99,6 +99,7 @@ function(vcpkg_build_msbuild)
/p:UseIntelMKL=No /p:UseIntelMKL=No
/p:WindowsTargetPlatformVersion=${_csc_TARGET_PLATFORM_VERSION} /p:WindowsTargetPlatformVersion=${_csc_TARGET_PLATFORM_VERSION}
/p:VcpkgManifestInstall=false /p:VcpkgManifestInstall=false
/p:VcpkgManifestEnabled=false
/m /m
) )
@ -113,8 +114,10 @@ function(vcpkg_build_msbuild)
APPEND _csc_OPTIONS APPEND _csc_OPTIONS
/p:ForceImportBeforeCppTargets=${SCRIPTS}/buildsystems/msbuild/vcpkg.targets /p:ForceImportBeforeCppTargets=${SCRIPTS}/buildsystems/msbuild/vcpkg.targets
"/p:VcpkgTriplet=${TARGET_TRIPLET}" "/p:VcpkgTriplet=${TARGET_TRIPLET}"
"/p:VcpkgCurrentInstalledDir=${CURRENT_INSTALLED_DIR}" "/p:VcpkgInstalledDir=${_VCPKG_INSTALLED_DIR}"
) )
else()
list(APPEND _csc_OPTIONS "/p:VcpkgEnabled=false")
endif() endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")