diff options
| author | Ryan Saunders <saunders@aggienetwork.com> | 2019-04-10 23:07:17 -0700 |
|---|---|---|
| committer | Ryan Saunders <saunders@aggienetwork.com> | 2019-04-10 23:07:17 -0700 |
| commit | a492caf9d5a069987b6309c6cbf8e5cc8c3ec6a8 (patch) | |
| tree | 11f6f1c5e3f4caa03f297162ffab9f79941f676c /scripts/toolchains | |
| parent | 80965287d1483f98f49ba83e026f022369798990 (diff) | |
| parent | b625cbf82f792409fa59262546cb5ed1ef7944e3 (diff) | |
| download | vcpkg-a492caf9d5a069987b6309c6cbf8e5cc8c3ec6a8.tar.gz vcpkg-a492caf9d5a069987b6309c6cbf8e5cc8c3ec6a8.zip | |
Merge branch 'master' into query_deps
Diffstat (limited to 'scripts/toolchains')
| -rw-r--r-- | scripts/toolchains/windows.cmake | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/toolchains/windows.cmake b/scripts/toolchains/windows.cmake index 266e023b1..12b1ae7f9 100644 --- a/scripts/toolchains/windows.cmake +++ b/scripts/toolchains/windows.cmake @@ -9,7 +9,6 @@ if(NOT _CMAKE_IN_TRY_COMPILE) message(FATAL_ERROR "Invalid setting for VCPKG_CRT_LINKAGE: \"${VCPKG_CRT_LINKAGE}\". It must be \"static\" or \"dynamic\"")
endif()
- set(CHARSET_FLAG "/utf-8")
if(VCPKG_PLATFORM_TOOLSET MATCHES "v120")
# VS 2013 does not support /utf-8
set(CHARSET_FLAG)
|