[lib3mf] update to 2.4.1 (#44444)

Co-authored-by: Martin Weismann <30837766+martinweismann@users.noreply.github.com>
Co-authored-by: Vijai Kumar S <vijaiaeroastro@users.noreply.github.com>
Co-authored-by: Kai Pastor <dg0yt@darc.de>
Co-authored-by: WangWeiLin-MV <156736127+WangWeiLin-MV@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
This commit is contained in:
Vijai Kumar S
2025-03-19 08:36:37 +01:00
committed by GitHub
parent 5055261244
commit c8173a3dd0
5 changed files with 40 additions and 14 deletions

View File

@@ -1,8 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aaca07d..a893ee1 100644
index c6a31790..fff0e5c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,13 +116,6 @@ add_library(${PROJECT_NAME} SHARED ${SRCS_COMMON} ${HDRS_COMMON}
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.0)
+cmake_minimum_required (VERSION 3.5)
cmake_policy(SET CMP0054 NEW)
cmake_policy(SET CMP0048 NEW)
@@ -145,13 +145,13 @@ endif()
SOURCE_GROUP("Source Files\\Autogenerated" FILES ${ACT_GENERATED_SOURCE})
@@ -13,16 +19,26 @@ index aaca07d..a893ee1 100644
-)
-list(FILTER LIBS_INCLUDE EXCLUDE REGEX "zlib|libzip|libressl")
-target_include_directories(${PROJECT_NAME} PRIVATE ${LIBS_INCLUDE})
+#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})
# allow FASTFLOAT_ALLOWS_LEADING_PLUS
add_definitions(-DFASTFLOAT_ALLOWS_LEADING_PLUS=1)
@@ -170,20 +163,33 @@ if (USE_INCLUDED_LIBZIP)
@@ -199,22 +199,39 @@ if (USE_INCLUDED_LIBZIP)
endif()
else()
- find_package(PkgConfig REQUIRED)
- pkg_check_modules(LIBZIP REQUIRED libzip)
- target_link_libraries(${PROJECT_NAME} ${LIBZIP_LIBRARIES})
+# find_package(PkgConfig REQUIRED)
+# pkg_check_modules(LIBZIP REQUIRED libzip)
+# target_link_libraries(${PROJECT_NAME} ${LIBZIP_LIBRARIES})
+ find_package(LIBZIP REQUIRED)
+ target_link_libraries(${PROJECT_NAME} PRIVATE libzip::zip)
endif()
@@ -34,10 +50,15 @@ index aaca07d..a893ee1 100644
- find_package(PkgConfig REQUIRED)
- pkg_check_modules(ZLIB REQUIRED zlib)
- target_link_libraries(${PROJECT_NAME} ${ZLIB_LIBRARIES})
+# find_package(PkgConfig REQUIRED)
+# pkg_check_modules(ZLIB REQUIRED zlib)
+# target_link_libraries(${PROJECT_NAME} ${ZLIB_LIBRARIES})
+ find_package(ZLIB REQUIRED)
+ target_link_libraries(${PROJECT_NAME} PRIVATE ZLIB::ZLIB)
endif()
-target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/submodules/fast_float/include)
+#devendor base64
+# Include the directory for header files
+find_path(CPP_BASE64_INCLUDE_DIRS "cpp-base64/base64.cpp")
@@ -52,12 +73,11 @@ index aaca07d..a893ee1 100644
+#devendor FastFloat
+find_package(FastFloat CONFIG REQUIRED)
+target_link_libraries(${PROJECT_NAME} PRIVATE FastFloat::fast_float)
+
set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" IMPORT_PREFIX "" )
# This makes sure symbols are exported
target_compile_options(${PROJECT_NAME} PRIVATE "-D__LIB3MF_EXPORTS")
diff --git a/Include/Common/NMR_StringUtils.h b/Include/Common/NMR_StringUtils.h
index 4cafe3a..b32bc76 100644
index 4cafe3a7..b32bc76a 100644
--- a/Include/Common/NMR_StringUtils.h
+++ b/Include/Common/NMR_StringUtils.h
@@ -37,7 +37,7 @@ and Exception-safe
@@ -70,19 +90,20 @@ index 4cafe3a..b32bc76 100644
#include <string>
#include <string.h>
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 2d94b2c..4f2a96b 100644
index 27973c84..bc93c89d 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -12,7 +12,6 @@ if (USE_INCLUDED_ZLIB)
@@ -12,7 +12,7 @@ if (USE_INCLUDED_ZLIB)
file(GLOB ZLIB_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "Libraries/zlib/Source/*.c")
endif()
-file (GLOB CPPBASE64_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "Libraries/cpp-base64/Source/*.cpp")
+#file (GLOB CPPBASE64_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "Libraries/cpp-base64/Source/*.cpp")
# sources
set(SRCS_PLATFORM
diff --git a/cmake/lib3mfConfig.cmake b/cmake/lib3mfConfig.cmake
index f1305b8..b7755c3 100644
index f1305b8f..b7755c3e 100644
--- a/cmake/lib3mfConfig.cmake
+++ b/cmake/lib3mfConfig.cmake
@@ -1,4 +1,7 @@

View File

@@ -4,9 +4,9 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO 3MFConsortium/lib3mf
REF "v${VERSION}"
SHA512 875529759aff6128b32291d0719b95a75a72a3b19f98711b12c9b1076727b231668b3b14604e69bb1fec79b4725fd098f030b7e965072e566bfb061f3086279c
SHA512 91d3928315bd5d1a8553284505d28c7d839a3cbd8b07a87bca5a21087fffa8ba7a1738ed14313212815a09e33f7a82318f7b069f1bbe40456b57ec528379ab4b
PATCHES
lib3mf_vcpkg.patch
lib3mf_vcpkg.patch
)
vcpkg_cmake_configure(

View File

@@ -1,6 +1,6 @@
{
"name": "lib3mf",
"version": "2.3.2",
"version": "2.4.1",
"description": "lib3mf is an implementation of the 3D Manufacturing Format file standard",
"homepage": "https://github.com/3MFConsortium/lib3mf",
"license": "BSD-2-Clause",

View File

@@ -4317,7 +4317,7 @@
"port-version": 0
},
"lib3mf": {
"baseline": "2.3.2",
"baseline": "2.4.1",
"port-version": 0
},
"libaaplus": {

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "16dface0395187d431f9c27e4917f25d923d38d2",
"version": "2.4.1",
"port-version": 0
},
{
"git-tree": "5e21531033faf6ea4bb51803d3281947a840d0ef",
"version": "2.3.2",