diff options
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") |