Merge branch release-2018

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

diff --git a/cmake/gmxManageGPU.cmake b/cmake/gmxManageGPU.cmake
index e05511239bf1fa3ba38b72ff4c8f6bd3d4940528..b32df691083db65993eeeee09230966961ffce65 100644 (file)
--- a/cmake/gmxManageGPU.cmake
+++ b/cmake/gmxManageGPU.cmake
@@ -1,7 +1,7 @@
 #
 # This file is part of the GROMACS molecular simulation package.
 #
-# Copyright (c) 2012,2013,2014,2015,2016,2017, by the GROMACS development team, led by
+# Copyright (c) 2012,2013,2014,2015,2016,2017,2018, by the GROMACS development team, led by
 # Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
 # and including many others, as listed in the AUTHORS file in the
 # top-level source directory and at http://www.gromacs.org.
@@ -39,6 +39,8 @@
 # - if CUDA is not found but GPUs were detected issue a warning
 if (NOT DEFINED GMX_GPU)
     set(GMX_GPU_AUTO TRUE CACHE INTERNAL "GPU acceleration will be selected automatically")
+else()
+    set(GMX_GPU_AUTO FALSE CACHE INTERNAL "GPU acceleration will be selected automatically")
 endif()
 option(GMX_GPU "Enable GPU acceleration" OFF)