diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2015-07-04 01:56:10 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-07-04 01:56:10 +0100 |
| commit | 5e9a21291cc6d1bdcdb65b761fbed905a214524d (patch) | |
| tree | 266821eb40b2cadc8013b6578c7798abfc15641a | |
| parent | dfc71765f87a0710547dc5010e592ed8075c0878 (diff) | |
Buildsystem: Fixed disabling compiler warnings in dep for clang/icc
(cherry picked from commit c24787f6665b5ea2b696bdfa7134a19ab5a3c331)
(reverts 77f7f562683753a15bd2d3f80e65385f88383566)
Conflicts:
dep/CascLib/CMakeLists.txt
dep/zmqpp/CMakeLists.txt
| -rw-r--r-- | dep/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | dep/gsoap/CMakeLists.txt | 5 |
2 files changed, 3 insertions, 8 deletions
diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt index a38dcbe068d..2b3796fb2fa 100644 --- a/dep/CMakeLists.txt +++ b/dep/CMakeLists.txt @@ -8,10 +8,10 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -if( CMAKE_COMPILER_IS_GNUCXX ) - add_definitions(--no-warnings) -elseif( MSVC ) +if( MSVC ) add_definitions(/W0) +else() + add_definitions(-w) endif() if(CMAKE_SYSTEM_NAME MATCHES "Linux") diff --git a/dep/gsoap/CMakeLists.txt b/dep/gsoap/CMakeLists.txt index 2cf78e1058b..e339ccb00ea 100644 --- a/dep/gsoap/CMakeLists.txt +++ b/dep/gsoap/CMakeLists.txt @@ -21,11 +21,6 @@ include_directories( # Little fix for MSVC / Windows platforms add_definitions(-D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=0) -# Turn off warnings for gsoap till the sources are updated -IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") - set_source_files_properties(stdsoap2.cpp PROPERTIES COMPILE_FLAGS -Wno-unused-parameter) -endif() - add_library(gsoap STATIC ${gsoap_STAT_SRCS}) set_target_properties(gsoap PROPERTIES LINKER_LANGUAGE CXX) |