Merge release-4-6 into master

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

diff --git a/cmake/gmxDetectAcceleration.cmake b/cmake/gmxDetectAcceleration.cmake
index 9f64b5fe705ae01c43ae7a607b6442172b7f2cba..8aea63c70f9766ca85c580dce20a7b000399c72a 100644 (file)
--- a/cmake/gmxDetectAcceleration.cmake
+++ b/cmake/gmxDetectAcceleration.cmake
@@ -37,6 +37,10 @@ macro(gmx_detect_acceleration GMX_SUGGESTED_ACCELERATION)
         message(WARNING "Cannot compile CPU detection code, which means no optimization.")
         message(STATUS "Compile output: ${GMX_DETECTCPU_COMPILE_OUTPUT}")
         set(OUTPUT_TMP "None")
+    elseif(NOT GMX_DETECTCPU_RUN_ACC EQUAL 0)
+        message(WARNING "Cannot run CPU detection code, which means no optimization.")
+        message(STATUS "Run output: ${OUTPUT_TMP}")
+        set(OUTPUT_TMP "None")
     endif(NOT GMX_DETECTCPU_COMPILED)
 
     string(STRIP "@OUTPUT_TMP@" OUTPUT_ACC)