From 86c5bde83f776ee288758194d9fbfc6f3ab85914 Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Wed, 5 Feb 2025 15:54:14 -0700 Subject: [PATCH] Meta: Pass C11 and C++17 flags to icu build on Windows icu 75.x and higher requires C++17. This change is pulled from an abandoned PR to uprev vcpkg's version to 75. Presumably the flags should be set upstream as well in their configure.ac --- Meta/CMake/vcpkg/overlay-ports/icu/portfile.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Meta/CMake/vcpkg/overlay-ports/icu/portfile.cmake b/Meta/CMake/vcpkg/overlay-ports/icu/portfile.cmake index 9bde72aae66..02f79127801 100644 --- a/Meta/CMake/vcpkg/overlay-ports/icu/portfile.cmake +++ b/Meta/CMake/vcpkg/overlay-ports/icu/portfile.cmake @@ -62,6 +62,11 @@ endif() if(VCPKG_TARGET_IS_WINDOWS) list(APPEND CONFIGURE_OPTIONS --enable-icu-build-win) + # https://github.com/microsoft/vcpkg/pull/38826/files#diff-ea2b03d0dcb43b39cfac7b4f96e0ba52a5e4f15c1df6986850e0d52d56229430R64 + if(NOT VCPKG_TARGET_IS_MINGW) + string(APPEND VCPKG_C_FLAGS "/std:c11") + string(APPEND VCPKG_CXX_FLAGS "/std:c++17") + endif() endif() if("tools" IN_LIST FEATURES)