diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2014-07-24 03:35:19 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2014-07-24 03:35:19 +0100 |
| commit | 5193eaac872d4bfa1fe511c15ea4e062824d19f2 (patch) | |
| tree | b11750c08d750ee3c99736a59944060e584413fc /cmake/compiler/clang | |
| parent | 8bc519a308ab78b1d6b243f49b332ddd9dd4ae17 (diff) | |
| parent | 7524e2dfda499177ffe633bd8284aad2cf1f547f (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/scripts/Kalimdor/zone_feralas.cpp
Diffstat (limited to 'cmake/compiler/clang')
| -rw-r--r-- | cmake/compiler/clang/settings.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/compiler/clang/settings.cmake b/cmake/compiler/clang/settings.cmake index 2de9e79ad88..87f8a2f82c8 100644 --- a/cmake/compiler/clang/settings.cmake +++ b/cmake/compiler/clang/settings.cmake @@ -15,4 +15,5 @@ if(WITH_COREDEBUG) endif() # -Wno-narrowing needed to suppress a warning in g3d -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-narrowing") +# -Wno-deprecated-register is needed to suppress 185 gsoap warnings on Unix systems. +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-narrowing -Wno-deprecated-register") |