aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt9
-rw-r--r--libquotient.pri4
2 files changed, 7 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f9bdef64..dee30bc2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,11 +38,12 @@ set(CMAKE_CXX_STANDARD 17)
if (MSVC)
add_compile_options(/EHsc /W4
- /wd4100 /wd4127 /wd4242 /wd4244 /wd4245 /wd4267 /wd4365 /wd4459 /wd4514
- /wd4571 /wd4619 /wd4623 /wd4625 /wd4626 /wd4710 /wd4774 /wd4820 /wd4946
- /wd5026 /wd5027)
+ /wd4100 /wd4127 /wd4242 /wd4244 /wd4245 /wd4267 /wd4365 /wd4456 /wd4459
+ /wd4464 /wd4505 /wd4514 /wd4571 /wd4619 /wd4623 /wd4625 /wd4626 /wd4706
+ /wd4710 /wd4774 /wd4820 /wd4946 /wd5026 /wd5027)
else()
- foreach (FLAG all "" pedantic extra error=return-type no-unused-parameter no-gnu-zero-variadic-macro-arguments)
+ foreach (FLAG all "" pedantic extra error=return-type no-unused-parameter
+ no-gnu-zero-variadic-macro-arguments)
CHECK_CXX_COMPILER_FLAG("-W${FLAG}" WARN_${FLAG}_SUPPORTED)
if ( WARN_${FLAG}_SUPPORTED AND NOT CMAKE_CXX_FLAGS MATCHES "(^| )-W?${FLAG}($| )")
add_compile_options(-W${FLAG})
diff --git a/libquotient.pri b/libquotient.pri
index 2ff14ce2..b12373e8 100644
--- a/libquotient.pri
+++ b/libquotient.pri
@@ -1,8 +1,8 @@
QT += network multimedia
-CONFIG += c++14 warn_on rtti_off create_prl object_parallel_to_source
+CONFIG += c++17 warn_on rtti_off create_prl object_parallel_to_source
win32-msvc* {
- QMAKE_CXXFLAGS_WARN_ON += -wd4100
+ QMAKE_CXXFLAGS_WARN_ON += -wd4100 -wd4267
} else {
QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter
}