fftw, fix cmake detection (#9791)

This commit is contained in:
Schrijvers Luc
2023-11-26 20:22:47 +01:00
committed by GitHub
parent 6505d1a167
commit 6758270062
2 changed files with 26 additions and 3 deletions

View File

@@ -15,7 +15,7 @@ HOMEPAGE="http://www.fftw.org/"
COPYRIGHT="2003, 2007-2011 Matteo Frigo
2003, 2007-2011 Massachusetts Institute of Technology"
LICENSE="GNU GPL v2"
REVISION="2"
REVISION="3"
SOURCE_URI="http://www.fftw.org/fftw-$portVersion.tar.gz"
CHECKSUM_SHA256="56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467"
PATCHES="fftw-$portVersion.patchset"

View File

@@ -1,4 +1,4 @@
From 47051e008ae0df4f5c6bda28bed708cb41fbb9af Mon Sep 17 00:00:00 2001
From af2c855bd6a2c7e8ad98763712d1d7755a172270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sat, 29 Dec 2018 17:38:55 +0100
Subject: Haiku: disable -mtune=native
@@ -18,5 +18,28 @@ index 61d3a98..ef0ea65 100644
# -malign-double for x86 systems
AX_CHECK_COMPILER_FLAGS(-malign-double, CFLAGS="$CFLAGS -malign-double")
--
2.19.1
2.42.1
From 5618ea4cdf923454800364a72fa8c1a4f358b4d3 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Sat, 25 Nov 2023 08:28:29 +0100
Subject: Fix cmake detection
diff --git a/FFTW3Config.cmake.in b/FFTW3Config.cmake.in
index 6b1fbc2..e8a2ed8 100644
--- a/FFTW3Config.cmake.in
+++ b/FFTW3Config.cmake.in
@@ -10,8 +10,6 @@ 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")
-
if (CMAKE_VERSION VERSION_LESS 2.8.3)
set (CMAKE_CURRENT_LIST_DIR)
endif ()
--
2.42.1