diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-19 16:43:26 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-20 10:35:39 +0200 |
| commit | 21d9384800f8579f2f76cc1230c0bcd0e240e1c7 (patch) | |
| tree | e5de94cde3cae5f86a037232abdb3c8d7676e538 /src | |
| parent | 76d02d895a935a8fa4721acfbbee9891f815fbf0 (diff) | |
cmake: Slience bening warnings in 3rdparty code
Change-Id: I1a47695abd6d6ea1527e2803dde0ed29aca014cc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/plugins/imageformats/jpeg/CMakeLists.txt | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 4069a0bb97..62cc030ea2 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -38,10 +38,11 @@ if (QT_FEATURE_gui) set(QT_QPA_DEFAULT_PLATFORM "${_default_platform}" CACHE STRING "QPA default platform") endif() +# Silence warnings in 3rdparty code if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - set_source_files_properties(../3rdparty/md4c/md4c.c PROPERTIES COMPILE_FLAGS "-Wno-error=unused-parameter -Wno-error=sign-compare -Wno-error=missing-field-initializers") + set_source_files_properties(../3rdparty/md4c/md4c.c PROPERTIES COMPILE_FLAGS "-Wno-unused-parameter -Wno-sign-compare -Wno-missing-field-initializers") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") - set_source_files_properties(../3rdparty/md4c/md4c.c PROPERTIES COMPILE_FLAGS "-Wno-error=unused-parameter -Wno-error=sign-compare -Wno-error=missing-field-initializers -Wno-error=missing-braces") + set_source_files_properties(../3rdparty/md4c/md4c.c PROPERTIES COMPILE_FLAGS "-Wno-unused-parameter -Wno-sign-compare -Wno-missing-field-initializers -Wno-missing-braces") endif() unset(qmake_module_config) diff --git a/src/plugins/imageformats/jpeg/CMakeLists.txt b/src/plugins/imageformats/jpeg/CMakeLists.txt index 2c45da7bbd..16584bdb7d 100644 --- a/src/plugins/imageformats/jpeg/CMakeLists.txt +++ b/src/plugins/imageformats/jpeg/CMakeLists.txt @@ -87,5 +87,13 @@ qt_extend_target(QJpegPlugin CONDITION NOT QT_FEATURE_system_jpeg ../../../3rdparty/libjpeg/src ) +# special case begin +if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" + OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" + OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") + target_compile_options(QJpegPlugin PRIVATE "-Wno-unused-parameter") +endif() +# special case end + #### Keys ignored in scope 5:.:../../../3rdparty:../../../3rdparty/libjpeg.pri:GCC: # QMAKE_CFLAGS_WARN_ON = "-Wno-unused-parameter" "-Wno-main" |