Disable two warnings for old Amber versions

Older versions of Amber fail to build with Clang >= 11 and GCC >=11 due
-Werror and warnings that have been fixed in later versions. Upgrading
Amber in older CTS branches risks accidental downgrades during fix
propagation. This change disables -Wsuggest-destructor-override for
Clang and -Wuninitialized for GCC when building libamber. These
should be re-enabled in newer Vulkan CTS releases.

Components: Framework, Vulkan

VK-GL-CTS issue: 3361

Change-Id: Ifc2ed69584d8ad179042b80212e02ceb9956d110

diff --git a/external/amber/CMakeLists.txt b/external/amber/CMakeLists.txt
index 74930f4..2fb3b3d 100644 (file)
--- a/external/amber/CMakeLists.txt
+++ b/external/amber/CMakeLists.txt
@@ -8,4 +8,12 @@ set(AMBER_SKIP_SAMPLES TRUE)
 set(AMBER_ENABLE_SHARED_CRT TRUE)
 set(Vulkan-Headers_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../vulkancts/framework/vulkan/)
 
+if (DE_COMPILER_IS_CLANG)
+       # Fixed upstream in 4d0115cccfcb3b73d20b6513b1c40748e6403c50
+       add_compile_options(-Wno-suggest-destructor-override)
+elseif (DE_COMPILER_IS_GCC)
+       # Fixed upstream in aa69a0ac23ea7f68dd32bbef210546a5d84c1734
+       add_compile_options(-Wno-uninitialized)
+endif ()
+
 add_subdirectory(src)