diff options
| author | Griffin Downs <grdowns@microsoft.com> | 2019-04-05 13:35:58 -0700 |
|---|---|---|
| committer | Griffin Downs <grdowns@microsoft.com> | 2019-04-05 13:35:58 -0700 |
| commit | 97b7134f41b48963345ef3d6bdf950c8d569d43d (patch) | |
| tree | ce2538582a8c15a6cfb568209e8577fe3f61af52 /ports/fftw3 | |
| parent | bdf903a991c3f187e59d6ee8056dc1600f060f3b (diff) | |
| parent | a141b603b93cce21f67733e649fbd076ade74393 (diff) | |
| download | vcpkg-97b7134f41b48963345ef3d6bdf950c8d569d43d.tar.gz vcpkg-97b7134f41b48963345ef3d6bdf950c8d569d43d.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/grdowns/5702
Diffstat (limited to 'ports/fftw3')
| -rw-r--r-- | ports/fftw3/CONTROL | 2 | ||||
| -rw-r--r-- | ports/fftw3/fftw3_arch_fix.patch | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ports/fftw3/CONTROL b/ports/fftw3/CONTROL index c1986ce4d..1ff42851f 100644 --- a/ports/fftw3/CONTROL +++ b/ports/fftw3/CONTROL @@ -1,5 +1,5 @@ Source: fftw3
-Version: 3.3.8-2
+Version: 3.3.8-3
Description: FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).
Feature: openmp
diff --git a/ports/fftw3/fftw3_arch_fix.patch b/ports/fftw3/fftw3_arch_fix.patch index a3462ea60..922d86b97 100644 --- a/ports/fftw3/fftw3_arch_fix.patch +++ b/ports/fftw3/fftw3_arch_fix.patch @@ -1,8 +1,8 @@ -diff --git a/CMakeLists - Kopie.txt b/CMakeLists.txt -index 95bd537a..245acc8f 100644 ---- a/CMakeLists - Kopie.txt -+++ b/CMakeLists.txt -@@ -131,6 +131,7 @@ endif () +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 95bd537a..245acc8f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -131,6 +131,7 @@ endif ()
include (CheckCCompilerFlag)
@@ -10,7 +10,7 @@ index 95bd537a..245acc8f 100644 if (ENABLE_SSE)
foreach (FLAG "-msse" "/arch:SSE")
unset (HAVE_SSE CACHE)
-@@ -176,8 +177,9 @@ if (ENABLE_AVX2) +@@ -176,8 +177,9 @@ if (ENABLE_AVX2)
endif ()
# AVX2 codelets require FMA support as well
|