diff --git a/externals/tinyxml2/CMakeLists.txt b/externals/tinyxml2/CMakeLists.txt index aa44e2411d0..01667886650 100644 --- a/externals/tinyxml2/CMakeLists.txt +++ b/externals/tinyxml2/CMakeLists.txt @@ -17,5 +17,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") target_compile_options_safe(tinyxml2_objs -Wno-format-nonliteral) target_compile_options_safe(tinyxml2_objs -Wno-old-style-cast) target_compile_options_safe(tinyxml2_objs -Wno-inconsistent-missing-destructor-override) + target_compile_options_safe(tinyxml2_objs -Wno-format) endif() diff --git a/lib/json.h b/lib/json.h index 7ba7eac7743..4732c9a09cf 100644 --- a/lib/json.h +++ b/lib/json.h @@ -25,6 +25,7 @@ SUPPRESS_WARNING_PUSH("-Wfloat-equal") SUPPRESS_WARNING_CLANG_PUSH("-Wtautological-type-limit-compare") SUPPRESS_WARNING_CLANG_PUSH("-Wextra-semi-stmt") SUPPRESS_WARNING_CLANG_PUSH("-Wzero-as-null-pointer-constant") +SUPPRESS_WARNING_CLANG_PUSH("-Wformat") #define PICOJSON_USE_INT64 #include @@ -32,6 +33,7 @@ SUPPRESS_WARNING_CLANG_PUSH("-Wzero-as-null-pointer-constant") SUPPRESS_WARNING_CLANG_POP SUPPRESS_WARNING_CLANG_POP SUPPRESS_WARNING_CLANG_POP +SUPPRESS_WARNING_CLANG_POP SUPPRESS_WARNING_POP #endif // jsonH