lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-28 10:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings on various GCC versions

Browse Source 
* Primarily this change fixes -Wdeprecated-copy on GCC-9, but it also tidies
  warnings on other versions.
This commit is contained in:
baldurk
2019-06-27 11:47:45 +01:00
parent 9b70400eff
commit 0dcedbbbcf
8 changed files with 42 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/spirv/CMakeLists.txt
+19 -8
View File
@@ -104,22 +104,33 @@ set(sources
add_definitions(-DAMD_EXTENSIONS)
add_definitions(-DNV_EXTENSIONS)
set_source_files_properties(${glslang_sources}
PROPERTIES COMPILE_FLAGS "-Wno-ignored-qualifiers -Wno-strict-aliasing")
set_property(SOURCE ${glslang_sources}
PROPERTY COMPILE_FLAGS "-Wno-ignored-qualifiers -Wno-strict-aliasing")
if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0)
set_source_files_properties(
# GCC 7.0 and above needs -Wno-implicit-fallthrough on these files
if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.9)
set_property(SOURCE
${glslang_dir}/glslang/MachineIndependent/reflection.cpp
${glslang_dir}/glslang/MachineIndependent/Intermediate.cpp
PROPERTIES COMPILE_FLAGS "-Wno-implicit-fallthrough -Wno-ignored-qualifiers")
APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-implicit-fallthrough")
endif()
# GCC 9.0 and above needs -Wno-deprecated-copy on glslang files, but also on
# spirv_compile.cpp since one of the issues is in the non-public header that
# is used from GlslangToSpv.h
if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.9)
set_property(SOURCE
${glslang_sources}
spirv_compile.cpp
APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-deprecated-copy")
endif()
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set_property(SOURCE "${glslang_sources}"
APPEND PROPERTY COMPILE_FLAGS "-Wno-unknown-warning-option -Wno-inconsistent-missing-override")
APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-unknown-warning-option -Wno-inconsistent-missing-override")
set_source_files_properties(${glslang_dir}/SPIRV/GlslangToSpv.cpp
PROPERTIES COMPILE_FLAGS "-Wno-tautological-constant-out-of-range-compare")
set_property(SOURCE ${glslang_dir}/SPIRV/GlslangToSpv.cpp
APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-tautological-constant-out-of-range-compare")
endif()
add_library(rdoc_spirv OBJECT ${sources})