From fb04266122b724cc6759e8fd709ae4240ca8dac3 Mon Sep 17 00:00:00 2001 From: Jake Turner Date: Mon, 18 Jul 2022 20:45:52 +0100 Subject: [PATCH] Disable Clang "-Wshorten-64-to-32" for files 3rdParty source files and some renderdoc files which include 3rdparty header files Disable "-Wshorten-64-to-32" for the whole of qrenderdoc render_python.cxx triggers the warning --- qrenderdoc/CMakeLists.txt | 2 +- qrenderdoc/Code/pyrenderdoc/CMakeLists.txt | 2 +- renderdoc/CMakeLists.txt | 5 ++++- renderdoc/driver/shaders/spirv/CMakeLists.txt | 2 +- renderdoc/driver/vulkan/CMakeLists.txt | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt index f867dd1c8..553d8c46e 100644 --- a/qrenderdoc/CMakeLists.txt +++ b/qrenderdoc/CMakeLists.txt @@ -214,7 +214,7 @@ endif() if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") file(APPEND ${CMAKE_BINARY_DIR}/qrenderdoc/qrenderdoc_cmake.pri - "QMAKE_CXXFLAGS+=-Wno-shadow\n") + "QMAKE_CXXFLAGS+=-Wno-shadow -Wno-shorten-64-to-32\n") endif() if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.9) diff --git a/qrenderdoc/Code/pyrenderdoc/CMakeLists.txt b/qrenderdoc/Code/pyrenderdoc/CMakeLists.txt index a96664188..6c7f49640 100644 --- a/qrenderdoc/Code/pyrenderdoc/CMakeLists.txt +++ b/qrenderdoc/Code/pyrenderdoc/CMakeLists.txt @@ -17,7 +17,7 @@ set(MODULE_DEFINES PRIVATE -DRENDERDOC_PLATFORM_LINUX) if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -Wno-unused-private-field -Wno-shadow") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -Wno-unused-private-field -Wno-shadow -Wno-shorten-64-to-32") endif() if(CMAKE_COMPILER_IS_GNUCXX) diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt index 97282180c..204520ab7 100644 --- a/renderdoc/CMakeLists.txt +++ b/renderdoc/CMakeLists.txt @@ -400,7 +400,10 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR APPLE) # -Wno-unused-lambda-capture available if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") set_property(SOURCE 3rdparty/jpeg-compressor/jpgd.cpp - APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-unreachable-code-break -Wno-implicit-fallthrough -Wno-shadow") + APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-unreachable-code-break -Wno-implicit-fallthrough -Wno-shadow -Wno-shorten-64-to-32") + + set_property(SOURCE 3rdparty/jpeg-compressor/jpge.cpp + APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-shorten-64-to-32") # Only clang has this warning. Fixing it in this file causes a compile error on windows set_source_files_properties(os/os_specific.cpp diff --git a/renderdoc/driver/shaders/spirv/CMakeLists.txt b/renderdoc/driver/shaders/spirv/CMakeLists.txt index 759ed7c00..e5f2f4113 100644 --- a/renderdoc/driver/shaders/spirv/CMakeLists.txt +++ b/renderdoc/driver/shaders/spirv/CMakeLists.txt @@ -135,7 +135,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") spirv_debug_glsl450.cpp spirv_debug_setup.cpp spirv_processor.cpp - APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-shadow") + APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-shadow -Wno-shorten-64-to-32") if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.9) set_property(SOURCE ${glslang_dir}/glslang/MachineIndependent/iomapper.cpp diff --git a/renderdoc/driver/vulkan/CMakeLists.txt b/renderdoc/driver/vulkan/CMakeLists.txt index 7f3aab528..9f6816f49 100644 --- a/renderdoc/driver/vulkan/CMakeLists.txt +++ b/renderdoc/driver/vulkan/CMakeLists.txt @@ -86,7 +86,7 @@ set(VULKAN_LAYER_FOLDER ${VULKAN_LAYER_FOLDER_DEFAULT} CACHE PATH "Path to insta if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") set_property(SOURCE vk_shaderdebug.cpp - APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-shadow") + APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-shadow -Wno-shorten-64-to-32") endif() if(ANDROID)