diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-07-03 11:19:27 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-07-03 11:19:27 +0200 |
| commit | c24787f6665b5ea2b696bdfa7134a19ab5a3c331 (patch) | |
| tree | 9cf8555f7f2399b5a0b2f3d28e1410247fc1f2f9 | |
| parent | 58adb74717be6f64511a16ab1194ee29378b0327 (diff) | |
Buildsystem: Fixed disabling compiler warnings in dep for clang/icc
| -rw-r--r-- | dep/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | dep/CascLib/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | dep/zmqpp/CMakeLists.txt | 5 |
3 files changed, 3 insertions, 13 deletions
diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt index e5fc80154bc..66f7bbb3984 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/CascLib/CMakeLists.txt b/dep/CascLib/CMakeLists.txt index 7217e8642f4..429ebfb78e8 100644 --- a/dep/CascLib/CMakeLists.txt +++ b/dep/CascLib/CMakeLists.txt @@ -39,9 +39,4 @@ set(TOMCRYPT_FILES include_directories(${CMAKE_SOURCE_DIR}/dep) -# Turn off warnings for casclib till the sources are updated -IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") - set_source_files_properties(Common.cpp PROPERTIES COMPILE_FLAGS -Wno-char-subscripts) -endif() - add_library(casc STATIC ${SRC_FILES} ${TOMCRYPT_FILES}) diff --git a/dep/zmqpp/CMakeLists.txt b/dep/zmqpp/CMakeLists.txt index 1792bc0a4f3..4166d4fd8b3 100644 --- a/dep/zmqpp/CMakeLists.txt +++ b/dep/zmqpp/CMakeLists.txt @@ -20,11 +20,6 @@ add_library(zmqpp STATIC ${zmqpp_STAT_SRCS} ) -# Turn off warnings for zmqpp till the sources are updated -IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") - set_source_files_properties(socket.cpp PROPERTIES COMPILE_FLAGS -Wno-unused-const-variable) -endif() - if (WIN32) add_definitions(-DBUILD_VERSION=\\"3.2.0\\") else() |