From ea83f1fd98b6cb99175c76a81e60e63975384a2c Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Wed, 5 Mar 2025 11:09:12 +0800 Subject: Fix last commit to make it build again on GCC 12 Bringing back some options that were in Collada DOM patch r7. --- patches/collada-dom-v2.3-r8.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'patches') diff --git a/patches/collada-dom-v2.3-r8.patch b/patches/collada-dom-v2.3-r8.patch index 3ce0eb0565..c72c014340 100644 --- a/patches/collada-dom-v2.3-r8.patch +++ b/patches/collada-dom-v2.3-r8.patch @@ -510,7 +510,7 @@ index 17fbaea..d0d5939 100644 +add_library(collada14dom STATIC ${COLLADA_BASE_SOURCES} ${dom_files}) +if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + target_compile_options(collada14dom PRIVATE -+ "-pedantic" "-Wno-error=unused-result" "-Wno-error=cast-user-defined") ++ "-pedantic" "-Wno-error=unused-result" "-Wno-cast-user-defined" "-Wno-nonnull") +elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + target_compile_options(collada14dom PRIVATE + "-Wno-error=unused-result" -- cgit v1.2.3