commit 555d2fb8dc9a4add3890fac51b4a186ee450251d
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Fri Apr 19 16:36:41 2024 +0200
- git patch to make FFTWLibraryDepends.cmake files optional, install to
proper dirs
fftw-cmake.patch | 27 +++++++++++++++++++++++++++
fftw-cmakedir.patch | 11 +++++++++++
2 files changed, 38 insertions(+)
---
diff --git a/fftw-cmake.patch b/fftw-cmake.patch
new file mode 100644
index 0000000..58a45ca
--- /dev/null
+++ b/fftw-cmake.patch
@@ -0,0 +1,27 @@
+From 394fa85ab5f8914b82b3404844444c53f5c7f095 Mon Sep 17 00:00:00 2001
+From: tobim <tobim+git...@fastmail.fm>
+Date: Thu, 11 Apr 2024 02:03:02 +0200
+Subject: [PATCH] Fix the cmake config file when configured with autotools
+ (#338)
+
+When the autotools based build is used the FFTW3ConfigDeps.cmake file is
+not generated, so including it fails with an error. By making the
+include optional, the config file can still be used in a limited
+fashion.
+---
+ FFTW3Config.cmake.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/FFTW3Config.cmake.in b/FFTW3Config.cmake.in
+index 6b1fbc2e1..6e073f5c8 100644
+--- a/FFTW3Config.cmake.in
++++ b/FFTW3Config.cmake.in
+@@ -10,7 +10,7 @@ set (FFTW3@PREC_SUFFIX@_LIBRARIES fftw3@PREC_SUFFIX@)
+ set (FFTW3@PREC_SUFFIX@_LIBRARY_DIRS @CMAKE_INSTALL_FULL_LIBDIR@)
+ set (FFTW3@PREC_SUFFIX@_INCLUDE_DIRS @CMAKE_INSTALL_FULL_INCLUDEDIR@)
+
+-include ("${CMAKE_CURRENT_LIST_DIR}/FFTW3LibraryDepends.cmake")
++include ("${CMAKE_CURRENT_LIST_DIR}/FFTW3LibraryDepends.cmake" OPTIONAL)
+
+ if (CMAKE_VERSION VERSION_LESS 2.8.3)
+ set (CMAKE_CURRENT_LIST_DIR)
diff --git a/fftw-cmakedir.patch b/fftw-cmakedir.patch
new file mode 100644
index 0000000..ed90b5f
--- /dev/null
+++ b/fftw-cmakedir.patch
@@ -0,0 +1,11 @@
+--- fftw-3.3.10/Makefile.am.orig 2020-12-10 13:02:44.000000000 +0100
++++ fftw-3.3.10/Makefile.am 2024-04-19 06:22:32.078215410 +0200
+@@ -153,7 +153,7 @@ FFTW3@PREC_SUFFIX@ConfigVersion.cmake: $
+ $(SED) \
+ -e 's|[@]FFTW_VERSION@|@PACKAGE_VERSION@|g' \
+ $(top_srcdir)/FFTW3ConfigVersion.cmake.in > $@
+-cmakedir = $(libdir)/cmake/fftw3
++cmakedir = $(libdir)/cmake/fftw3@PREC_SUFFIX@
+ cmake_DATA = FFTW3@PREC_SUFFIX@Config.cmake
FFTW3@PREC_SUFFIX@ConfigVersion.cmake
+
+ WISDOM_DIR = /etc/fftw
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/fftw3.git/commitdiff/555d2fb8dc9a4add3890fac51b4a186ee450251d
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
