Bugfix: miniz upgrade (#22)

* Do not include miniz.c inside source, avoids duplicate function defs Miniz is compiled as separate source file. * Compile miniz.c as source file * Updated miniz from 1.15 to 2.1. This fixes a number of compiler warnings/errors for gcc > 4.6.
KATRIN-Experiment · Apr 21, 2020 · f05ccd6 · f05ccd6
1 parent 2f60b54
commit f05ccd6
Show file tree

Hide file tree

Showing 4 changed files with 8,322 additions and 4,236 deletions.
diff --git a/KEMField/Source/IO/StructuredASCII/CMakeLists.txt b/KEMField/Source/IO/StructuredASCII/CMakeLists.txt
@@ -47,11 +47,9 @@ if (KEMField_USE_ZLIB)
   kasper_external_include_directories (${ZLIB_INCLUDE_DIRS})
   add_cflag(KEMFIELD_USE_ZLIB)
 else (KEMField_USE_ZLIB)
-set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/include/miniz.c PROPERTIES COMPILE_FLAGS -Wno-strict-aliasing)
 set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/include/miniz.hh PROPERTIES COMPILE_FLAGS -Wno-strict-aliasing)
 list (APPEND STRUCTUREDASCII_HEADERFILES
     ${CMAKE_CURRENT_SOURCE_DIR}/include/miniz.hh
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/miniz.c
     )
 endif (KEMField_USE_ZLIB)
 
@@ -68,6 +66,13 @@ set (STRUCTUREDASCII_SOURCEFILES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/KSATestD.cc
 )
 
+if (NOT KEMField_USE_ZLIB)
+set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/include/miniz.c PROPERTIES COMPILE_FLAGS -Wno-strict-aliasing)
+list (APPEND STRUCTUREDASCII_SOURCEFILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/miniz.c
+    )
+endif (NOT KEMField_USE_ZLIB)
+
 ##################################################
 
 add_library (KEMStructuredASCII SHARED ${STRUCTUREDASCII_SOURCEFILES} ${STRUCTUREDASCII_HEADERFILES})