Merge branch 'release'

Utilities/gdcmzlib/CMakeLists.txt

@@ -14,26 +14,41 @@ project(${ZLIB_NAMESPACE} C)
 # Do full dependency headers.
 include_regular_expression("^.*$")
 
-# source files for zlib
-set(ZLIB_SRCS
-  adler32.c
-  compress.c
-  crc32.c
-  deflate.c
-  #example.c
-  gzio.c
-  infback.c
-  inffast.c
-  inflate.c
-  inftrees.c
-  #minigzip.c
-  trees.c
-  uncompr.c
-  zutil.c
-  )
+#============================================================================
+# zlib
+#============================================================================
 
+set(ZLIB_PUBLIC_HDRS
+    ${CMAKE_CURRENT_BINARY_DIR}/zconf.h
+    zlib.h
+)
+set(ZLIB_PRIVATE_HDRS
+    crc32.h
+    deflate.h
+    gzguts.h
+    inffast.h
+    inffixed.h
+    inflate.h
+    inftrees.h
+    trees.h
+    zutil.h
+)
+set(ZLIB_SRCS
+    adler32.c
+    compress.c
+    crc32.c
+    deflate.c
+    inflate.c
+    infback.c
+    inftrees.c
+    inffast.c
+    trees.c
+    uncompr.c
+    zutil.c
+)
 
-# for windows add the .def and .rc files to the source list if building shared libs
+# for windows add the .def and .rc files to the source list
+# if building shared libs
 if(WIN32)
   if(BUILD_SHARED_LIBS)
     set(ZLIB_DLL 1)
@@ -42,15 +57,15 @@ if(WIN32)
         if(NOT MINGW)
           set(ZLIB_SRCS ${ZLIB_SRCS} zlib.def zlib.rc  )
         endif()
-      endif() 
-    endif()   
+      endif()
+    endif()
   endif()
 endif()
 
-  configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/zconf.in.h
-    ${CMAKE_CURRENT_BINARY_DIR}/zconf.h
-  )
+configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/zconf.in.h
+  ${CMAKE_CURRENT_BINARY_DIR}/zconf.h
+)
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
 )

Utilities/gdcmzlib/COPYING

@@ -1,7 +1,6 @@
-/* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.3, July 18th, 2005
+Copyright notice:
 
-  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+ (C) 1995-2022 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -21,10 +20,3 @@
 
   Jean-loup Gailly        Mark Adler
   [email protected]          [email protected]
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
-  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
-*/
-