upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-26 11:35:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable null conversion warning in CMake.

Browse Source 
It gives problems when using Clang and boost::shared_ptr when compiling
for C++11. The issue can't be fixed since Wesnoth uses C++98. (So we use
NULL instead of nullptr.)
This commit is contained in:
Mark de Wever 2013-06-01 11:22:10 +02:00
parent 4b059500c9
commit 5301eedbe6
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -280,6 +280,13 @@ check_compiler_has_flag(
"-Wno-mismatched-tags"
)
check_compiler_has_flag(
CXX_FLAGS_STRICT_COMPILATION
"-Wnull-conversion"
HAS_COMPILER_FLAG_WNULL_CONVERSION
"-Wno-null-conversion"
)
if(NOT CMAKE_COMPILER_IS_GNUCXX)
# Silences warnings about overloaded virtuals.
# (GCC doesn't complain Clang does.)

1
changelog
View File

@ -19,6 +19,7 @@ Version 1.11.4+dev:
* Miscellaneous and bug fixes
* Added a new playlist FULL_MUSIC_PLAYLIST, which contains all Wesnoth tracks
in alphabetical order
* Added -Wno-null-conversion to the CMake pedantic flags.
Version 1.11.4:
* AI: