Merge branch release-2016

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

diff --git a/cmake/gmxDetectSimd.cmake b/cmake/gmxDetectSimd.cmake
index e83c3abd790d0e6c65d6a22b2a0a76eb321af918..50088be99f190879bf4d71a9804e27ddba2a99d5 100644 (file)
--- a/cmake/gmxDetectSimd.cmake
+++ b/cmake/gmxDetectSimd.cmake
@@ -104,7 +104,7 @@ function(gmx_suggest_simd _suggested_simd)
                 set(OUTPUT_SIMD "IBM_QPX")
             elseif(CPU_DETECTION_FEATURES MATCHES " neon_asimd ")
                 set(OUTPUT_SIMD "ARM_NEON_ASIMD")
-            elseif(CPU_DETECTION_FEATURES MATCHES " neon ")
+            elseif(CPU_DETECTION_FEATURES MATCHES " neon " AND NOT GMX_DOUBLE)
                 set(OUTPUT_SIMD "ARM_NEON")
             endif()
         endif()