[packages/flann] - added libdir patch (adjust cmake files install path)
qboosh
qboosh at pld-linux.org
Tue Jan 17 18:28:07 CET 2023
commit ea65eeef8975894fd03a714bcb970ab0a4a5fec7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Jan 17 18:29:17 2023 +0100
- added libdir patch (adjust cmake files install path)
flann-libdir.patch | 11 +++++++++++
flann.spec | 2 ++
2 files changed, 13 insertions(+)
---
diff --git a/flann.spec b/flann.spec
index 841e5ac..223289b 100644
--- a/flann.spec
+++ b/flann.spec
@@ -14,6 +14,7 @@ Group: Libraries
Source0: https://github.com/flann-lib/flann/archive/%{version}/%{name}-%{version}.tar.gz
# Source0-md5: d187585a55676e2b12bbb7ea04d1398f
Patch0: %{name}-python.patch
+Patch1: %{name}-libdir.patch
URL: https://github.com/flann-lib/flann
BuildRequires: cmake >= 2.6
%{?with_openmp:BuildRequires: gcc-c++ >= 6:4.2}
@@ -112,6 +113,7 @@ Dowiązania Pythona do biblioteki FLANN.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
install -d build
diff --git a/flann-libdir.patch b/flann-libdir.patch
new file mode 100644
index 0000000..2d0884e
--- /dev/null
+++ b/flann-libdir.patch
@@ -0,0 +1,11 @@
+--- flann-1.9.2/CMakeLists.txt.orig 2021-04-12 09:15:28.000000000 +0200
++++ flann-1.9.2/CMakeLists.txt 2023-01-17 18:18:25.687565563 +0100
+@@ -164,7 +164,7 @@ else()
+ endif()
+
+ # install and export variables
+-set(config_install_dir "lib/cmake/${PROJECT_NAME}")
++set(config_install_dir "lib/cmake${LIB_SUFFIX}/${PROJECT_NAME}")
+ set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
+ set(version_config "${generated_dir}/flann-config-version.cmake")
+ set(project_config "${generated_dir}/flann-config.cmake")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/flann.git/commitdiff/ea65eeef8975894fd03a714bcb970ab0a4a5fec7
More information about the pld-cvs-commit
mailing list