Ver Fonte

COMP: Disabling warnings in zlib code to avoid changing it too much.

Brad King há 21 anos atrás
pai
commit
f9e61d1aa4
2 ficheiros alterados com 16 adições e 0 exclusões
  1. 8 0
      Utilities/cmzlib/CMakeLists.txt
  2. 8 0
      Utilities/cmzlib/zconf.h

+ 8 - 0
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

+ 8 - 0
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