blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 13:00:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

moved warning avoidance over to c files

Browse source
This commit is contained in:
AdenKoperczak 2024-09-19 14:37:35 -04:00
parent 2cd0a16028
commit 797f26e461
6 changed files with 41 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scwx-qt/scwx-qt.cmake
View file

@ -599,11 +599,11 @@ target_include_directories(supercell-wx PUBLIC ${scwx-qt_SOURCE_DIR}/source)
target_compile_options(scwx-qt PRIVATE target_compile_options(scwx-qt PRIVATE
$<$<CXX_COMPILER_ID:MSVC>:/W4 /WX> $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror -Wno-error=delete-non-abstract-non-virtual-dtor> $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror>
) )
target_compile_options(supercell-wx PRIVATE target_compile_options(supercell-wx PRIVATE
$<$<CXX_COMPILER_ID:MSVC>:/W4 /WX> $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror -Wno-error=delete-non-abstract-non-virtual-dtor> $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror>
) )
if (MSVC) if (MSVC)

9
scwx-qt/source/scwx/qt/gl/gl.hpp
View file

@ -1,7 +1,16 @@
#pragma once #pragma once
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wdelete-non-abstract-non-virtual-dtor"
#endif
#include <QOpenGLFunctions_3_3_Core> #include <QOpenGLFunctions_3_3_Core>
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
#define SCWX_GL_CHECK_ERROR() \ #define SCWX_GL_CHECK_ERROR() \
{ \ { \
GLenum err; \ GLenum err; \

10
scwx-qt/source/scwx/qt/map/alert_layer.hpp
View file

@ -1,6 +1,16 @@
#pragma once #pragma once
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wdelete-non-abstract-non-virtual-dtor"
#endif
#include <scwx/awips/phenomenon.hpp> #include <scwx/awips/phenomenon.hpp>
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
#include <scwx/qt/map/draw_layer.hpp> #include <scwx/qt/map/draw_layer.hpp>
#include <scwx/qt/types/text_event_key.hpp> #include <scwx/qt/types/text_event_key.hpp>

9
scwx-qt/source/scwx/qt/settings/text_settings.cpp
View file

@ -1,8 +1,17 @@
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wdelete-non-abstract-non-virtual-dtor"
#endif
#include <scwx/qt/settings/text_settings.hpp> #include <scwx/qt/settings/text_settings.hpp>
#include <scwx/qt/types/text_types.hpp> #include <scwx/qt/types/text_types.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
namespace scwx namespace scwx
{ {
namespace qt namespace qt

10
wxdata/source/scwx/common/color_table.cpp
View file

@ -10,8 +10,18 @@
#include <sstream> #include <sstream>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wunused-parameter"
#endif
#include <boost/gil.hpp> #include <boost/gil.hpp>
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
#include <hsluv.h> #include <hsluv.h>
namespace scwx namespace scwx

2
wxdata/wxdata.cmake
View file

@ -260,7 +260,7 @@ target_include_directories(wxdata INTERFACE ${scwx-data_SOURCE_DIR}/include)
target_compile_options(wxdata PRIVATE target_compile_options(wxdata PRIVATE
$<$<CXX_COMPILER_ID:MSVC>:/W4 /WX> $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX>
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror -Wno-error=unused-parameter> $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror>
) )
if (MSVC) if (MSVC)