From 90e7a4d41f588d87415381fdb507735e6438992c Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 23 Jul 2014 11:55:25 -0400 Subject: [PATCH] liblzma: Disable warnings to avoid changing 3rd party code --- Utilities/cmliblzma/CMakeLists.txt | 10 ++++++++++ Utilities/cmliblzma/common/sysdefs.h | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Utilities/cmliblzma/CMakeLists.txt b/Utilities/cmliblzma/CMakeLists.txt index 85efa8c81..fc50dbe21 100644 --- a/Utilities/cmliblzma/CMakeLists.txt +++ b/Utilities/cmliblzma/CMakeLists.txt @@ -190,6 +190,16 @@ INCLUDE_DIRECTORIES( "${CMLIBLZMA_BINARY_DIR}" ) +# Disable warnings to avoid changing 3rd party code. +IF("${CMAKE_C_COMPILER_ID}" MATCHES + "^(GNU|Clang|AppleClang|XL|VisualAge|SunPro|MIPSpro|HP|Intel)$") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w") +ELSEIF("${CMAKE_C_COMPILER_ID}" MATCHES "^(PathScale)$") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -woffall") +ELSEIF(BORLAND) + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w-") +ENDIF() + ADD_LIBRARY(cmliblzma ${LZMA_SRCS}) INSTALL(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmliblzma) diff --git a/Utilities/cmliblzma/common/sysdefs.h b/Utilities/cmliblzma/common/sysdefs.h index 7481e3def..c84f01c22 100644 --- a/Utilities/cmliblzma/common/sysdefs.h +++ b/Utilities/cmliblzma/common/sysdefs.h @@ -17,7 +17,9 @@ #define LZMA_SYSDEFS_H #if defined(_MSC_VER) -# pragma warning(disable: 4028 4244 4761) +# pragma warning(push,1) +# pragma warning(disable: 4142) /* benign redefinition of type */ +# pragma warning(disable: 4761) /* integral size mismatch in argument */ #endif //////////////