diff options
| author | Brad King <brad.king@kitware.com> | 2005-02-10 12:46:34 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2005-02-10 12:46:34 (GMT) |
| commit | f9e61d1aa44d19afda2ea46b026463abada80b20 (patch) | |
| tree | 251260007656b941d59f088f9c26582f92cd3925 | |
| parent | 816d73f23f18933d831118edafdfcdb15ac73090 (diff) | |
| download | CMake-f9e61d1aa44d19afda2ea46b026463abada80b20.zip CMake-f9e61d1aa44d19afda2ea46b026463abada80b20.tar.gz CMake-f9e61d1aa44d19afda2ea46b026463abada80b20.tar.bz2 | |
COMP: Disabling warnings in zlib code to avoid changing it too much.
| -rw-r--r-- | Utilities/cmzlib/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Utilities/cmzlib/zconf.h | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/Utilities/cmzlib/CMakeLists.txt b/Utilities/cmzlib/CMakeLists.txt index 1c8c6e5..02f8e10 100644 --- a/Utilities/cmzlib/CMakeLists.txt +++ b/Utilities/cmzlib/CMakeLists.txt @@ -3,6 +3,14 @@ INCLUDE_REGULAR_EXPRESSION("^(deflate|inf|trees|zconf|zlib|zutil).*$") INCLUDE_DIRECTORIES(${CMZLIB_SOURCE_DIR}) +# Tell the header files included from the .c files that they are being +# built. Used to disable warnings since we do not want to change the +# code much. +ADD_DEFINITIONS(-DCMZLIB_IN_C) + +# Match all headers for dependencies but complain about none. +INCLUDE_REGULAR_EXPRESSION("^.*$" "^$") + # source files for zlib SET(ZLIB_SRCS adler32.c gzio.c inftrees.c uncompr.c diff --git a/Utilities/cmzlib/zconf.h b/Utilities/cmzlib/zconf.h index 187d135..52699ba 100644 --- a/Utilities/cmzlib/zconf.h +++ b/Utilities/cmzlib/zconf.h @@ -1,4 +1,12 @@ #include "cm_zlib_mangle.h" + +/* Disable some warnings so that we do not have to change the code much. */ +#if defined(CMZLIB_IN_C) +# if defined(__BORLANDC__) +# pragma warn -8004 /* Variable assigned a value that is not used. */ +# endif +#endif + /* zconf.h -- configuration of the zlib compression library * Copyright (C) 1995-2002 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h |