diff options
author | Erik Kundiman <erik@megapahit.org> | 2025-03-05 11:09:12 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2025-03-05 12:37:45 +0800 |
commit | ea83f1fd98b6cb99175c76a81e60e63975384a2c (patch) | |
tree | 7d2f180d6e6688e0203d3005f00f7701f783e34b | |
parent | a4e8aabfa95d236a7832b7b07eaccf8500f1cd76 (diff) |
Fix last commit to make it build again on GCC 12
Bringing back some options that were in Collada DOM patch r7.
-rw-r--r-- | patches/collada-dom-v2.3-r8.patch | 2 |
1 files changed, 1 insertions, 1 deletions
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" |