Lib3MF update using branch instead of fork

.github/workflows/build.yml

@@ -2,8 +2,9 @@ on: [push, pull_request]
 name: Build
 jobs:
   build-linux:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
+      - run: sudo apt update
       - run: sudo apt install -y valgrind uuid-dev
       - uses: actions/checkout@v2
         with:
@@ -25,7 +26,7 @@ jobs:
           name: bindings.zip
           path: build/bindings.zip
   build-macos:
-    runs-on: macos-10.15
+    runs-on: macos-11
     steps:
       - uses: actions/checkout@v2
         with:
@@ -42,7 +43,7 @@ jobs:
           path: build/lib3mf.dylib
 
   codecoverage-macos:
-    runs-on: macos-10.15
+    runs-on: macos-11
     steps:
       - uses: actions/checkout@v2
         with:
@@ -139,7 +140,7 @@ jobs:
       - run: ctest -V
         working-directory: ./build
   assemble-sdk:
-    runs-on: ubuntu-18.04
+    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-18.04
+    runs-on: ubuntu-20.04
     needs: [assemble-sdk]
     steps:
       - run: sudo apt install -y zip unzip
@@ -213,7 +214,7 @@ jobs:
           cmake --build . --config Release
           ./Release/Example_ExtractInfo.exe ../../Files/Helix.3mf
   deploy-macos:
-    runs-on: macos-10.15
+    runs-on: macos-11
     needs: [assemble-sdk]
     steps:
       - name: Download lib3mf_sdk artifact

.gitmodules

@@ -1,9 +1,15 @@
-[submodule "Tests/googletest"]
-	path = Tests/googletest
-	url = https://github.com/google/googletest.git
-[submodule "Tests/libressl"]
-	path = Tests/libressl
-	url = https://github.com/3MFConsortium/forks-libressl-distribution.git
 [submodule "submodules/AutomaticComponentToolkit"]
 	path = submodules/AutomaticComponentToolkit
 	url = https://github.com/Autodesk/AutomaticComponentToolkit.git
+[submodule "submodules/zlib"]
+	path = submodules/zlib
+	url = https://github.com/madler/zlib.git
+[submodule "submodules/libzip"]
+	path = submodules/libzip
+	url = https://github.com/nih-at/libzip.git
+[submodule "submodules/cpp-base64"]
+	path = submodules/cpp-base64
+	url = https://github.com/ReneNyffenegger/cpp-base64.git
+[submodule "submodules/googletest"]
+	path = submodules/googletest
+	url = https://github.com/google/googletest.git

CMakeLists.txt

@@ -115,19 +115,54 @@ 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")
+
+
 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)
+target_include_directories(${PROJECT_NAME} PRIVATE ${LIBS_INCLUDE})
 
 if (USE_INCLUDED_LIBZIP)
-    target_compile_options(${PROJECT_NAME} PRIVATE "-DZIP_STATIC")
-    target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Include/Libraries/libzip)
+    target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Libraries/libzip/Include)
+    if(MSVC)
+      target_compile_definitions(${PROJECT_NAME} PRIVATE _CRT_SECURE_NO_WARNINGS)
+      target_compile_definitions(${PROJECT_NAME} PRIVATE _CRT_NONSTDC_NO_DEPRECATE)
+    endif()
+    if(WIN32)
+      target_link_libraries(${PROJECT_NAME} PRIVATE advapi32)
+      # disable win32 build failing 'initializing': conversion from 'zip_uint64_t' to 'size_t', possible loss of data 
+      if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
+        target_compile_options(${PROJECT_NAME} PRIVATE /wd4244)
+      endif()
+    endif()
+
+    # create libzip autogenerated platform specific headers
+    if(NOT EXISTS ${CMAKE_BINARY_DIR}/libzip)
+    execute_process(
+      COMMAND ${CMAKE_COMMAND} "-DZLIB_INCLUDE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/submodules/zlib" 
+            "-DZLIB_LIBRARY=zlibstatic" "-DENABLE_COMMONCRYPTO=OFF" "-DENABLE_GNUTLS=OFF" "-DENABLE_MBEDTLS=OFF" 
+            "-DENABLE_OPENSSL=OFF" "-DENABLE_WINDOWS_CRYPTO=OFF" 
+            "-DENABLE_BZIP2=OFF" "-DENABLE_LZMA=OFF" "-DENABLE_ZSTD=OFF"
+            "-DBUILD_TOOLS=OFF" "-DBUILD_REGRESS=OFF"
+            "-DBUILD_EXAMPLES=OFF" "-DBUILD_DOC=OFF" "-DBUILD_SHARED_LIBS=OFF" "-DLIBZIP_DO_INSTALL=OFF"
+            "-S" "${CMAKE_CURRENT_SOURCE_DIR}/submodules/libzip" "-B" "${CMAKE_CURRENT_BINARY_DIR}/libzip"   
+      RESULT_VARIABLE CMD_ERROR
+      OUTPUT_QUIET)
+    MESSAGE( STATUS "CMD_ERROR:" ${CMD_ERROR})
+    endif()
+    target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/libzip)
 
     if (UNIX OR MINGW)
-        target_compile_options(${PROJECT_NAME} PRIVATE "-DHAVE_FSEEKO")
-        target_compile_options(${PROJECT_NAME} PRIVATE "-DHAVE_FTELLO")
-        target_compile_options(${PROJECT_NAME} PRIVATE "-DHAVE_STRCASECMP")
-        target_compile_options(${PROJECT_NAME} PRIVATE "-DHAVE_UNISTD_H")
+      target_compile_options(${PROJECT_NAME} PRIVATE "-DHAVE_FSEEKO")
+      target_compile_options(${PROJECT_NAME} PRIVATE "-DHAVE_FTELLO")
+      target_compile_options(${PROJECT_NAME} PRIVATE "-DHAVE_STRCASECMP")
+      target_compile_options(${PROJECT_NAME} PRIVATE "-DHAVE_UNISTD_H")
     endif()
 
 else()
@@ -136,7 +171,7 @@ 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)

Include/Common/OPC/NMR_OpcPackageReader.h

@@ -40,7 +40,7 @@ NMR_OpcPackageReader.h defines an OPC Package reader in a portable way.
 #include "Common/OPC/NMR_OpcPackageRelationship.h"
 #include "Common/3MF_ProgressMonitor.h"
 #include "Common/NMR_ModelWarnings.h"
-#include "Libraries/libzip/zip.h"
+#include "zip.h"
 #include <list>
 #include <vector>
 #include <map>

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

Include/Common/Platform/NMR_ImportStream_ZIP.h

@@ -35,7 +35,7 @@ This is a stream class for importing from a libZIP object.
 #define __NMR_IMPORTSTREAM_ZIP
 
 #include "Common/Platform/NMR_ImportStream.h"
-#include "Libraries/libzip/zip.h"
+#include "zip.h"
 
 #define IMPORTSTREAM_ZIP_CHUNKSIZE (1024 * 1024)