diff options
| author | Felipe Aburaya <felipe.aburaya@hotmail.com> | 2018-07-03 15:39:13 +0200 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-07-03 06:39:13 -0700 |
| commit | 4ebdbe7e88ad93423e9d0d75eb066ecf8ab5fcad (patch) | |
| tree | 1be40a00a479adb76cbebdcdc48cb250abd2acda /scripts | |
| parent | 084eb43343e4024d38f1cbc0a5d2afe159338920 (diff) | |
| download | vcpkg-4ebdbe7e88ad93423e9d0d75eb066ecf8ab5fcad.tar.gz vcpkg-4ebdbe7e88ad93423e9d0d75eb066ecf8ab5fcad.zip | |
[3fd] Initial port of 3FD project (#3811)
* [2fd] Initial port of 3FD project
* [3fd] Fix 2017 builds. Enable static builds in dynamic triplets. Improve vcpkg_build_msbuild().
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_build_msbuild.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/cmake/vcpkg_build_msbuild.cmake b/scripts/cmake/vcpkg_build_msbuild.cmake index db04530ef..fdf519f2c 100644 --- a/scripts/cmake/vcpkg_build_msbuild.cmake +++ b/scripts/cmake/vcpkg_build_msbuild.cmake @@ -15,6 +15,7 @@ ## [OPTIONS </p:ZLIB_INCLUDE_PATH=X>...] ## [OPTIONS_RELEASE </p:ZLIB_LIB=X>...] ## [OPTIONS_DEBUG </p:ZLIB_LIB=X>...] +## [USE_VCPKG_INTEGRATION] ## ) ## ``` ## @@ -105,7 +106,11 @@ function(vcpkg_build_msbuild) endif() if(_csc_USE_VCPKG_INTEGRATION) - list(APPEND _csc_OPTIONS /p:ForceImportBeforeCppTargets=${VCPKG_ROOT_DIR}/scripts/buildsystems/msbuild/vcpkg.targets) + list( + APPEND _csc_OPTIONS + /p:ForceImportBeforeCppTargets=${VCPKG_ROOT_DIR}/scripts/buildsystems/msbuild/vcpkg.targets + "/p:VcpkgTriplet=${TARGET_TRIPLET}" + ) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") |