From 1ea8d92cc3439ae2ddcd70e84023994240d1571e Mon Sep 17 00:00:00 2001
From: Benoit Blanchon <github@benoitblanchon.fr>
Date: Fri, 1 Mar 2019 11:41:47 +0100
Subject: [PATCH] Muted warning "will change in GCC 7.1" (issue #914)

---
 CHANGELOG.md                     | 1 +
 third-party/catch/CMakeLists.txt | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7d880dc..d6374347 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ HEAD
 * Fixed warning "unused variable" with GCC 4.4 (issue #912)
 * Fixed warning "cast  increases required alignment" (issue #914)
 * Fixed warning "conversion may alter value" (issue #914)
+* Muted warning "will change in GCC 7.1" (issue #914)
 * Added a clear error message for `StaticJsonBuffer` and `DynamicJsonBuffer`
 
 v6.9.0 (2019-02-26)
diff --git a/third-party/catch/CMakeLists.txt b/third-party/catch/CMakeLists.txt
index 5ff6bec6..b9817a87 100644
--- a/third-party/catch/CMakeLists.txt
+++ b/third-party/catch/CMakeLists.txt
@@ -11,3 +11,8 @@ target_include_directories(catch
 	PUBLIC
 	${CMAKE_CURRENT_SOURCE_DIR}
 )
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+	# prevent "xxx will change in GCC x.x" with arm-linux-gnueabihf-gcc
+	target_compile_options(catch PRIVATE -Wno-psabi)
+endif()