From 329fee2f0b60f78348c12c57565a357b36896494 Mon Sep 17 00:00:00 2001 From: Daniel Simon Date: Sun, 26 May 2024 12:07:13 -0700 Subject: [PATCH] Disabled maybe-uninitialized error for AssetLib/Obj/ObjFileParser.cpp as it seems to be spurious. Also fixed error message for previous GCC build issue modification (#5593) Co-authored-by: Kim Kulling --- code/CMakeLists.txt | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 2f9e05922c..f4c2936727 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -471,9 +471,9 @@ ADD_ASSIMP_IMPORTER( MDL AssetLib/MDL/HalfLife/UniqueNameGenerator.h ) -IF(((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT MINGW AND NOT HAIKU) AND CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 13) - message(STATUS "GCC13 detected disabling \"-Warray-bounds and -Wstringop-overflow\" for - AssetLib/MDL/MDLLoader.cpp as it appears to be a false positive") +IF(((CMAKE_CXX_COMPILER_ID MATCHES "GNU") AND NOT MINGW AND NOT HAIKU) AND CMAKE_CXX_COMPILER_VERSION GREATER_EQUAL 13) + message(STATUS "GCC13 detected disabling \"-Warray-bounds and -Wstringop-overflow\" for" + " AssetLib/MDL/MDLLoader.cpp as it appears to be a false positive") set_source_files_properties(AssetLib/MDL/MDLLoader.cpp PROPERTIES COMPILE_FLAGS "-Wno-array-bounds -Wno-stringop-overflow" ) @@ -511,6 +511,14 @@ ADD_ASSIMP_IMPORTER( OBJ AssetLib/Obj/ObjTools.h ) +IF(((CMAKE_CXX_COMPILER_ID MATCHES "GNU") AND NOT MINGW AND NOT HAIKU) AND CMAKE_CXX_COMPILER_VERSION EQUAL 14) + message(STATUS "GCC14 detected disabling \"-Wmaybe-uninitialized\" for" + " AssetLib/Obj/ObjFileParser.cpp as it appears to be a false positive") + set_source_files_properties(AssetLib/Obj/ObjFileParser.cpp PROPERTIES + COMPILE_FLAGS "-Wno-maybe-uninitialized" + ) +endif() + ADD_ASSIMP_IMPORTER( OGRE AssetLib/Ogre/OgreImporter.h AssetLib/Ogre/OgreStructs.h