diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-03-31 00:35:40 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-03-31 00:35:40 -0700 |
| commit | 5414655ea46fde2e87943f93d3356533b5b183e4 (patch) | |
| tree | 038dde7fe2f8132c521586200eddfe2c6d856267 | |
| parent | a6957ebf389648e2b2253e9b18f83d6a1508ab10 (diff) | |
| download | vcpkg-5414655ea46fde2e87943f93d3356533b5b183e4.tar.gz vcpkg-5414655ea46fde2e87943f93d3356533b5b183e4.zip | |
[vcpkg] Fix regression introduced in 8dc2699e5d. Fixes #873. Fixes #871. Fixes #874. Fixes #876.
When using the toolchain file, VCPKG_TARGET_TRIPLET was not specified, which resulted in all libraries being built against x86-windows.
| -rw-r--r-- | scripts/cmake/vcpkg_configure_cmake.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 14e50d5bf..e434d78b7 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -59,6 +59,7 @@ function(vcpkg_configure_cmake) list(APPEND _csc_OPTIONS + "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}" "-DCMAKE_CXX_FLAGS= /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP" "-DCMAKE_C_FLAGS= /DWIN32 /D_WINDOWS /W3 /utf-8 /MP" "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON" |