Re-enable Clang warning for Amber
authorMika Väinölä <mika.vainola@siru.fi>
Tue, 11 Jan 2022 07:45:02 +0000 (09:45 +0200)
committerMatthew Netsch <quic_mnetsch@quicinc.com>
Thu, 20 Jan 2022 23:55:49 +0000 (23:55 +0000)
The Amber version used by vulkan-cts-1.2.5 and later includes 4d0115c
which should fix all suggest-destructor-override warnings.

Components: Framework, Vulkan

VK-GL-CTS issue: 3361

Change-Id: I36437c797c067521e1444d20cfece33babfe435a

external/amber/CMakeLists.txt

index 5610303..c2786be 100644 (file)
@@ -9,10 +9,7 @@ set(AMBER_ENABLE_SHARED_CRT TRUE)
 set(AMBER_ENABLE_RTTI TRUE CACHE BOOL "Enable runtime type information" FORCE)
 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)
+if (DE_COMPILER_IS_GCC)
        # Fixed upstream in aa69a0ac23ea7f68dd32bbef210546a5d84c1734
        add_compile_options(-Wno-uninitialized)
 endif ()