From dd07fb5a15a3cae4f83d29418ef515bed40f658a Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Fri, 13 Jan 2023 18:02:34 -0800 Subject: [PATCH] CMake: Update a compiler version check It looks like AppleClang 10 and 11 generate bogus missing braces warnings as well. The macOS Intel builder, which has AppleClang 11.0.0.11000033 installed, is failing with wireshark/epan/dissectors/packet-rtps.c:11403:63: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces] coherent_set_entity_info coherent_set_entity_info_object = {0}; ^ {} --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5b4e2331c3..2d5cb7f85b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -695,7 +695,7 @@ else() # ! MSVC # if((CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS "5.1") OR (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_LESS "6.0") OR - (CMAKE_C_COMPILER_ID STREQUAL "AppleClang" AND CMAKE_C_COMPILER_VERSION VERSION_LESS "10.0")) + (CMAKE_C_COMPILER_ID STREQUAL "AppleClang" AND CMAKE_C_COMPILER_VERSION VERSION_LESS "12.0")) if(NOT CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_VERSION VERSION_LESS "4.7") list(APPEND WIRESHARK_C_ONLY_FLAGS -Wno-missing-field-initializers) endif()