From 5414655ea46fde2e87943f93d3356533b5b183e4 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 31 Mar 2017 00:35:40 -0700 Subject: [PATCH] [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. --- scripts/cmake/vcpkg_configure_cmake.cmake | 1 + 1 file changed, 1 insertion(+) 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"