Просмотр исходного кода

Muted warning "will change in GCC 7.1" (issue #914)

Benoit Blanchon 7 лет назад
Родитель
Сommit
1ea8d92cc3
2 измененных файлов с 6 добавлено и 0 удалено
  1. 1 0
      CHANGELOG.md
  2. 5 0
      third-party/catch/CMakeLists.txt

+ 1 - 0
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)

+ 5 - 0
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()