Merge release-2019 into master

[alexxy/gromacs.git] / src / external / build-fftw / CMakeLists.txt

diff --git a/src/external/build-fftw/CMakeLists.txt b/src/external/build-fftw/CMakeLists.txt
index aada5438d667487825ea941c7010c8909824b678..a0a1379a0124f0e41e0f42a6bb10c4f95e7b0fe9 100644 (file)
--- a/src/external/build-fftw/CMakeLists.txt
+++ b/src/external/build-fftw/CMakeLists.txt
@@ -80,9 +80,11 @@ elseif(${GMX_SIMD_ACTIVE} MATCHES "^(AVX)" AND NOT ${GMX_SIMD_ACTIVE} MATCHES "^
     set(_fftw_simd_support_level --enable-sse2;--enable-avx;--enable-avx2)
 elseif(${GMX_SIMD_ACTIVE} MATCHES "^(AVX_512)")
     # MSVC, GCC < 4.9, Clang < 3.9 do not support AVX-512, so
-    # we should not enable it.
+    # we should not enable it there. FFTW does not support clang with
+    # AVX-512, so we should not enable that either.
     if(MSVC OR (CMAKE_COMPILER_IS_GNUCC AND CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9.0) OR
-       (CMAKE_C_COMPILER_ID MATCHES "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_LESS 3.9.0))
+        (CMAKE_C_COMPILER_ID MATCHES "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_LESS 3.9.0) OR
+        (CMAKE_C_COMPILER_ID MATCHES "Clang" AND ${GMX_SIMD_ACTIVE} MATCHES "^(AVX_512)"))
         set(_fftw_simd_support_level --enable-sse2;--enable-avx;--enable-avx2)
     else()
         set(_fftw_simd_support_level --enable-sse2;--enable-avx;--enable-avx2;--enable-avx512)