[packages/lib3mf] - rel 2, fix paths in generated cmake files
baggins
baggins at pld-linux.org
Sat Mar 14 15:02:05 CET 2026
commit f5b16b42838f90149fe73944a6cd7bcb9d8e8093
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Mar 14 16:01:49 2026 +0100
- rel 2, fix paths in generated cmake files
cmake.patch | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
lib3mf.spec | 4 +++-
2 files changed, 67 insertions(+), 1 deletion(-)
---
diff --git a/lib3mf.spec b/lib3mf.spec
index 4024f32..6b5400c 100644
--- a/lib3mf.spec
+++ b/lib3mf.spec
@@ -5,12 +5,13 @@
Summary: Implementation of the 3D Manufacturing Format file standard
Name: lib3mf
Version: 2.5.0
-Release: 1
+Release: 2
License: BSD
Group: Libraries
Source0: https://github.com/3MFConsortium/lib3mf/archive/v%{version}/%{name}-%{version}.tar.gz
# Source0-md5: 43da209fe1b28464ea6f93fb7697d187
Patch0: fast-float-include-path.patch
+Patch1: cmake.patch
URL: https://3mf.io/
BuildRequires: cmake
BuildRequires: libzip-devel
@@ -48,6 +49,7 @@ Pliki nagłówkowe biblioteki %{name}.
%prep
%setup -q
%patch -P0 -p1
+%patch -P1 -p1
%build
mkdir -p build
diff --git a/cmake.patch b/cmake.patch
new file mode 100644
index 0000000..406454f
--- /dev/null
+++ b/cmake.patch
@@ -0,0 +1,64 @@
+--- lib3mf-2.5.0/cmake/lib3mfConfig.cmake.in.orig 2026-02-24 18:23:52.000000000 +0100
++++ lib3mf-2.5.0/cmake/lib3mfConfig.cmake.in 2026-03-14 15:35:35.449999436 +0100
+@@ -25,14 +25,14 @@
+
+ get_filename_component(_lib3mf_package_dir "${CMAKE_CURRENT_LIST_DIR}" ABSOLUTE)
+ get_filename_component(LIB3MF_ROOT_DIR "${_lib3mf_package_dir}/../../.." ABSOLUTE)
+-set(LIB3MF_CDYNAMIC_ADDITIONAL_SOURCE "${LIB3MF_ROOT_DIR}/include/Bindings/CDynamic/lib3mf_dynamic.cc")
++set(LIB3MF_CDYNAMIC_ADDITIONAL_SOURCE "${LIB3MF_ROOT_DIR}/include/lib3MF/Bindings/CDynamic/lib3mf_dynamic.cc")
+
+ set(_lib3mf_library_location_definition "LIB3MF_LIBRARY_LOCATION=\"$<TARGET_FILE:lib3mf::lib3mf>\"")
+
+ if(NOT TARGET lib3mf::Cpp)
+ add_library(lib3mf::Cpp INTERFACE IMPORTED)
+ set_target_properties(lib3mf::Cpp PROPERTIES
+- INTERFACE_INCLUDE_DIRECTORIES "${LIB3MF_ROOT_DIR}/include/Bindings/Cpp"
++ INTERFACE_INCLUDE_DIRECTORIES "${LIB3MF_ROOT_DIR}/include/lib3MF/Bindings/Cpp"
+ )
+ target_link_libraries(lib3mf::Cpp INTERFACE lib3mf::lib3mf)
+ endif()
+@@ -40,7 +40,7 @@
+ if(NOT TARGET lib3mf::C)
+ add_library(lib3mf::C INTERFACE IMPORTED)
+ set_target_properties(lib3mf::C PROPERTIES
+- INTERFACE_INCLUDE_DIRECTORIES "${LIB3MF_ROOT_DIR}/include/Bindings/C"
++ INTERFACE_INCLUDE_DIRECTORIES "${LIB3MF_ROOT_DIR}/include/lib3MF/Bindings/C"
+ )
+ target_link_libraries(lib3mf::C INTERFACE lib3mf::lib3mf)
+ endif()
+@@ -48,7 +48,7 @@
+ if(NOT TARGET lib3mf::CppDynamic)
+ add_library(lib3mf::CppDynamic INTERFACE IMPORTED)
+ set_target_properties(lib3mf::CppDynamic PROPERTIES
+- INTERFACE_INCLUDE_DIRECTORIES "${LIB3MF_ROOT_DIR}/include/Bindings/CppDynamic"
++ INTERFACE_INCLUDE_DIRECTORIES "${LIB3MF_ROOT_DIR}/include/lib3MF/Bindings/CppDynamic"
+ INTERFACE_COMPILE_DEFINITIONS "${_lib3mf_library_location_definition}"
+ )
+ endif()
+@@ -56,7 +56,7 @@
+ if(NOT TARGET lib3mf::CDynamic)
+ add_library(lib3mf::CDynamic INTERFACE IMPORTED)
+ set_target_properties(lib3mf::CDynamic PROPERTIES
+- INTERFACE_INCLUDE_DIRECTORIES "${LIB3MF_ROOT_DIR}/include/Bindings/CDynamic"
++ INTERFACE_INCLUDE_DIRECTORIES "${LIB3MF_ROOT_DIR}/include/lib3MF/Bindings/CDynamic"
+ INTERFACE_COMPILE_DEFINITIONS "${_lib3mf_library_location_definition}"
+ INTERFACE_SOURCES "${LIB3MF_CDYNAMIC_ADDITIONAL_SOURCE}"
+ )
+@@ -77,7 +77,7 @@
+
+ set(lib3mf_BINDING_COMPONENT "${_lib3mf_selected_component}")
+ set(lib3mf_LIBRARIES "lib3mf::${_lib3mf_selected_component}")
+-set(lib3mf_INCLUDE_DIRS "${LIB3MF_ROOT_DIR}/include/Bindings/${_lib3mf_selected_component}")
++set(lib3mf_INCLUDE_DIRS "${LIB3MF_ROOT_DIR}/include/lib3MF/Bindings/${_lib3mf_selected_component}")
+
+ foreach(_lib3mf_component IN LISTS lib3mf_FIND_COMPONENTS)
+ if(NOT _lib3mf_component IN_LIST lib3mf_known_components)
+@@ -87,7 +87,7 @@
+
+ if(TARGET lib3mf::lib3mf)
+ set_property(TARGET lib3mf::lib3mf APPEND PROPERTY
+- INTERFACE_INCLUDE_DIRECTORIES "${LIB3MF_ROOT_DIR}/include/Bindings/${_lib3mf_selected_component}"
++ INTERFACE_INCLUDE_DIRECTORIES "${LIB3MF_ROOT_DIR}/include/lib3MF/Bindings/${_lib3mf_selected_component}"
+ )
+ if(_lib3mf_selected_component STREQUAL "CppDynamic" OR _lib3mf_selected_component STREQUAL "CDynamic")
+ set_property(TARGET lib3mf::lib3mf APPEND PROPERTY
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lib3mf.git/commitdiff/f5b16b42838f90149fe73944a6cd7bcb9d8e8093
More information about the pld-cvs-commit
mailing list