update zlib to v1.3.0

.github/workflows/build.yml

@@ -2,8 +2,9 @@ on: [push, pull_request]
 name: Build
 jobs:
   build-linux:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
+      - run: sudo apt update
       - run: sudo apt install -y valgrind uuid-dev
       - uses: actions/checkout@v2
         with:
@@ -44,7 +45,7 @@ jobs:
   codecoverage-macos:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Install Prerequisites
@@ -139,7 +140,7 @@ jobs:
       - run: ctest -V
         working-directory: ./build
   assemble-sdk:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: [build-windows-release, build-linux, build-macos]
     steps:
       - run: sudo apt install -y zip unzip
@@ -161,7 +162,7 @@ jobs:
           name: lib3mf_sdk.zip
           path: build/lib3mf_sdk.zip
   deploy-linux:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: [assemble-sdk]
     steps:
       - run: sudo apt install -y zip unzip
@@ -235,4 +236,4 @@ jobs:
           sh Examples/Cpp/GenerateMake.sh
           cd Examples/Cpp/build
           cmake --build .
-          ./Example_ExtractInfo ../../Files/Helix.3mf
+          ./Example_ExtractInfo ../../Files/Helix.3mf

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "submodules/fast_float"]
 	path = submodules/fast_float
 	url = https://github.com/fastfloat/fast_float.git
+[submodule "submodules/zlib"]
+	path = submodules/zlib
+	url = https://github.com/madler/zlib.git

CMakeLists.txt

@@ -115,6 +115,15 @@ add_library(${PROJECT_NAME} SHARED ${SRCS_COMMON} ${HDRS_COMMON}
 )
 SOURCE_GROUP("Source Files\\Autogenerated" FILES ${ACT_GENERATED_SOURCE})
 
+
+file(GLOB
+    LIBS_INCLUDE
+    LIST_DIRECTORIES true
+    ${CMAKE_CURRENT_SOURCE_DIR}/Libraries/*/Include
+)
+list(FILTER LIBS_INCLUDE EXCLUDE REGEX "zlib|libzip|libressl")
+target_include_directories(${PROJECT_NAME} PRIVATE ${LIBS_INCLUDE})
+
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Source)
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Include/API)
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Include)
@@ -136,17 +145,13 @@ else()
     target_link_libraries(${PROJECT_NAME} ${LIBZIP_LIBRARIES})
 endif()
 if (USE_INCLUDED_ZLIB)
-    target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Include/Libraries/zlib)
+    target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Libraries/zlib/Include)
 else()
     find_package(PkgConfig REQUIRED)
     pkg_check_modules(ZLIB REQUIRED zlib)
     target_link_libraries(${PROJECT_NAME} ${ZLIB_LIBRARIES})
 endif()
 
-
-target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/submodules/fast_float/include)
-
-
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" IMPORT_PREFIX "" )
 # This makes sure symbols are exported
 target_compile_options(${PROJECT_NAME} PRIVATE "-D__LIB3MF_EXPORTS")

Include/Common/NMR_StringUtils.h

@@ -37,7 +37,7 @@ and Exception-safe
 #include "Common/NMR_Types.h"
 #include "Common/NMR_Local.h"
 
-#include <fast_float/fast_float.h>
+#include <fast_float.h>
 
 #include <string>
 #include <string.h>

Include/Common/Platform/NMR_ExportStream_Compressed.h

@@ -36,7 +36,7 @@ NMR_ExportStream_Compressed.h defines a stream to write compressed files
 #include "Common/NMR_Types.h"
 #include "Common/Platform/NMR_ExportStream.h"
 #include "Common/Platform/NMR_PortableZIPWriter.h"
-#include "Libraries/zlib/zlib.h"
+#include "zlib.h"
 
 #define EXPORTSTREAM_WRITE_BUFFER_CHUNKSIZE 1024
 

Include/Common/Platform/NMR_ExportStream_ZIP.h

@@ -36,7 +36,7 @@ NMR_PortableZIPWriter.h defines a portable stream to write into ZIP files
 #include "Common/NMR_Types.h"
 #include "Common/Platform/NMR_ExportStream.h"
 #include "Common/Platform/NMR_PortableZIPWriter.h"
-#include "Libraries/zlib/zlib.h"
+#include "zlib.h"
 
 #include <array>
 

Include/Common/Platform/NMR_ImportStream_Compressed.h

@@ -35,7 +35,7 @@ This is a stream class for importing from a compressed object.
 #define __NMR_IMPORTSTREAM_COMPRESSED
 
 #include "Common/Platform/NMR_ImportStream.h"
-#include "Libraries/zlib/zlib.h"
+#include "zlib.h"
 
 #define IMPORTSTREAM_READ_BUFFER_CHUNKSIZE 1024
 #define IMPORTSTREAM_COMPRESSED_CHUNKSIZE 1024