summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cmake/QtBuild.cmake8
-rw-r--r--cmake/QtCompilerFlags.cmake23
2 files changed, 29 insertions, 2 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index 58f820416c..4cc14588d7 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -1423,6 +1423,14 @@ function(qt_skip_warnings_are_errors_when_repo_unclean target)
endif()
endfunction()
+function(qt_disable_warnings target)
+ get_target_property(target_type "${target}" TYPE)
+ if(target_type STREQUAL "INTERFACE_LIBRARY")
+ return()
+ endif()
+ set_target_properties("${target}" PROPERTIES QT_COMPILE_OPTIONS_DISABLE_WARNINGS ON)
+endfunction()
+
function(qt_get_sanitized_plugin_type plugin_type out_var)
# Used to handle some edge cases such as platforms/darwin
string(REGEX REPLACE "[-/]" "_" plugin_type "${plugin_type}")
diff --git a/cmake/QtCompilerFlags.cmake b/cmake/QtCompilerFlags.cmake
index 35733027f5..a376ac0097 100644
--- a/cmake/QtCompilerFlags.cmake
+++ b/cmake/QtCompilerFlags.cmake
@@ -1,6 +1,25 @@
# Set warnings. All compilers except MSVC support -Wall -Wextra
+# Allow opting out by setting a QT_COMPILE_WARNINGS_OFF property on targets. This would be the
+# equivalent of qmake's CONFIG += warn_off.
+
+set(_qt_compiler_warning_flags_on "")
+set(_qt_compiler_warning_flags_off "")
+
if (MSVC)
- add_compile_options(/W3)
+ list(APPEND _qt_compiler_warning_flags_on /W3)
+ list(APPEND _qt_compiler_warning_flags_off -W0)
else()
- add_compile_options(-Wall -Wextra)
+ list(APPEND _qt_compiler_warning_flags_on -Wall -Wextra)
+ list(APPEND _qt_compiler_warning_flags_off -w)
endif()
+
+set(_qt_compiler_warning_flags_condition
+ "$<BOOL:$<TARGET_PROPERTY:QT_COMPILE_OPTIONS_DISABLE_WARNINGS>>")
+set(_qt_compiler_warning_flags_genex
+ "$<IF:${_qt_compiler_warning_flags_condition},${_qt_compiler_warning_flags_off},${_qt_compiler_warning_flags_on}>")
+
+# Need to replace semicolons so that the list is not wrongly expanded in the add_compile_options
+# call.
+string(REPLACE ";" "$<SEMICOLON>"
+ _qt_compiler_warning_flags_genex "${_qt_compiler_warning_flags_genex}")
+add_compile_options(${_qt_compiler_warning_flags_genex})