Merge release-4-6 into master

[alexxy/gromacs.git] / cmake / FindFFTW.cmake

diff --git a/cmake/FindFFTW.cmake b/cmake/FindFFTW.cmake
index a7fb8ec54e0ca427f477554643e43710eee8e69b..bc10a6fe1c471d07d9804d5a40e8f1d727b3e1b9 100644 (file)
--- a/cmake/FindFFTW.cmake
+++ b/cmake/FindFFTW.cmake
@@ -75,7 +75,7 @@ if (${FFTW}_FOUND)
   foreach(AVX_FUNCTION ${${FFTW}_FUNCTION_PREFIX}_have_simd_avx)
     check_library_exists("${${FFTW}_LIBRARIES}" "${AVX_FUNCTION}" "" ${FFTW}_HAVE_${AVX_FUNCTION})
     if(${FFTW}_HAVE_${AVX_FUNCTION})
-      set(${FFTW}_HAVE_AVX TRUE CACHE BOOL "If ${${FFTW}_PKG} was built with AVX support")
+      set(${FFTW}_HAVE_AVX TRUE)
       break()
     endif(${FFTW}_HAVE_${AVX_FUNCTION})
   endforeach()
@@ -84,7 +84,7 @@ if (${FFTW}_FOUND)
   foreach(SIMD_FCT ${${FFTW}_FUNCTION_PREFIX}_have_simd_sse2;${${FFTW}_FUNCTION_PREFIX}_have_simd_avx;${${FFTW}_FUNCTION_PREFIX}_have_simd_altivec;${${FFTW}_FUNCTION_PREFIX}_have_simd_neon;${${FFTW}_FUNCTION_PREFIX}_have_sse2;${${FFTW}_FUNCTION_PREFIX}_have_sse;${${FFTW}_FUNCTION_PREFIX}_have_altivec)
     check_library_exists("${${FFTW}_LIBRARIES}" "${SIMD_FCT}" "" ${FFTW}_HAVE_${SIMD_FCT})
     if(${FFTW}_HAVE_${SIMD_FCT})
-      set(${FFTW}_HAVE_SIMD TRUE CACHE  BOOL "If ${${FFTW}_PKG} was built with SIMD support")
+      set(${FFTW}_HAVE_SIMD TRUE)
       break()
     endif(${FFTW}_HAVE_${SIMD_FCT})
   endforeach()
@@ -98,6 +98,5 @@ if (${FFTW}_FOUND)
   endif ()
   set(CMAKE_REQUIRED_LIBRARIES)
 endif (${FFTW}_FOUND)
-set(${FFTW}_HAVE_SIMD FALSE CACHE BOOL "If ${${FFTW}_PKG} was built with SIMD support")
 
-mark_as_advanced(${FFTW}_INCLUDE_DIR ${FFTW}_LIBRARY ${FFTW}_HAVE_SIMD ${FFTW}_HAVE_AVX)
+mark_as_advanced(${FFTW}_INCLUDE_DIR ${FFTW}_LIBRARY)