diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-09-13 19:17:11 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-10-13 08:55:28 +0000 |
| commit | c66e9c14f8686aa96a6ec06b0c0a70b1ecfd69bc (patch) | |
| tree | d8fa9a471cb233b6f95fcc82afae0dbe7490e614 /src/3rdparty | |
| parent | bb13c17a362ed0c59e64424f586cf8b5241a1b07 (diff) | |
Suppress a bunch of warnings in assimp with gcc and clang
Change-Id: Ic8cdcdceb959030163b661f29011b825f28b2896
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/assimp/assimp.pri | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/3rdparty/assimp/assimp.pri b/src/3rdparty/assimp/assimp.pri index 370d0d136..ea63531de 100644 --- a/src/3rdparty/assimp/assimp.pri +++ b/src/3rdparty/assimp/assimp.pri @@ -20,13 +20,18 @@ contains(QT_CONFIG, system-zlib) { DEFINES += ASSIMP_BUILD_NO_OWN_ZLIB ASSIMP_BUILD_NO_COMPRESSED_IFC ASSIMP_BUILD_NO_Q3BSP_IMPORTER # Stop compiler complaining about ignored qualifiers on return types -intel_icc: QMAKE_CXXFLAGS += -wd858 -else: gcc: QMAKE_CXXFLAGS += -Wno-ignored-qualifiers +intel_icc: { + QMAKE_CFLAGS_WARN_ON += -wd858 + QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON +} gcc|clang: { + QMAKE_CFLAGS_WARN_ON += -Wno-ignored-qualifiers -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated-declarations -Wno-unused-function -Wno-reorder + QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON +} # warning #310: old-style parameter list (anachronism) -intel_icc: QMAKE_CFLAGS += -wd310 +intel_icc: QMAKE_CFLAGS_WARN_ON += -wd310 -clang: CONFIG += warn_off +CONFIG += warn_on VPATH += \ $$PWD \ |