projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Post-release version bump
[quassel.git]
/
cmake
/
QuasselCompileSettings.cmake
diff --git
a/cmake/QuasselCompileSettings.cmake
b/cmake/QuasselCompileSettings.cmake
index
4493d4d
..
f2747df
100644
(file)
--- a/
cmake/QuasselCompileSettings.cmake
+++ b/
cmake/QuasselCompileSettings.cmake
@@
-1,6
+1,6
@@
# This file contains compile flags and general build configuration for Quassel
#
# This file contains compile flags and general build configuration for Quassel
#
-# (C) 2014-202
0
by the Quassel Project <devel@quassel-irc.org>
+# (C) 2014-202
2
by the Quassel Project <devel@quassel-irc.org>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
@@
-45,7
+45,7
@@
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-Wvla
-Werror=return-type
"$<$<BOOL:${FATAL_WARNINGS}>:-Werror>"
-Wvla
-Werror=return-type
"$<$<BOOL:${FATAL_WARNINGS}>:-Werror>"
- -Wno-error=deprecated # Don't break on Qt upgrades
+ -Wno-error=deprecated
-declarations
# Don't break on Qt upgrades
-Wno-unknown-pragmas
"$<$<NOT:$<CONFIG:Debug>>:-U_FORTIFY_SOURCE;-D_FORTIFY_SOURCE=2>"
)
-Wno-unknown-pragmas
"$<$<NOT:$<CONFIG:Debug>>:-U_FORTIFY_SOURCE;-D_FORTIFY_SOURCE=2>"
)
@@
-83,17
+83,17
@@
elseif(MSVC)
# CMake puts /W3 in CMAKE_CXX_FLAGS which will be appended later, so we need to replace
string(REPLACE "/W3" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
# CMake puts /W3 in CMAKE_CXX_FLAGS which will be appended later, so we need to replace
string(REPLACE "/W3" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
- # Silence
annoying/useless warnings
- # C4127: conditional expression is constant
+ # Silence
warnings that are hard or impossible to avoid
+ # C4127: conditional expression is constant
[in qvector.h as of Qt 5.15.2]
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4127")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4127")
- # C4244: 'identifier': conversion from 't1' to 't2', possible loss of data
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244")
- # C4456: declaration of 'identifier' hides previous local declaration
+ # C4456: declaration of 'identifier' hides previous local declaration [caused by foreach macro, among others]
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4456")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4456")
- # C4458: declaration of 'identifier' hides class member
+ # C4458: declaration of 'identifier' hides class member
[caused by MOC for Peer::_id]
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4458")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4458")
- # C4996: deprecation warnings
+ # C4996: deprecation warnings
[unavoidable due to wide range of supported Qt versions]
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996")
+ # C5240: 'nodiscard': attribute is ignored in this syntactic position [in qcolor.h as of Qt 5.15.2]
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd5240")
# Link against the correct version of the C runtime
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/NODEFAULTLIB:libcmt /DEFAULTLIB:msvcrt ${CMAKE_EXE_LINKER_FLAGS_RELEASE}")
# Link against the correct version of the C runtime
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/NODEFAULTLIB:libcmt /DEFAULTLIB:msvcrt ${CMAKE_EXE_LINKER_FLAGS_RELEASE}")