Revert "Disable default-on NVML support in CMake"

This reverts commit 969fb1d08b7fd33c809ce967b9e3bc38d5ac83cd.

Sorry, my bad for not testing it before submitting. It won't work to
just define the option inside a conditional for whether the option is
set - then it will never be available in the CMake GUI.

Change-Id: Ia8310332932d6ce81c9249560744fdaa2648bee4

diff --git a/cmake/gmxManageGPU.cmake b/cmake/gmxManageGPU.cmake
index 5fc123686f25cfcffc83a482d51c89deaaaa8dba..435ed0c17e3c8715c001866731484a3fe36d9e63 100644 (file)
--- a/cmake/gmxManageGPU.cmake
+++ b/cmake/gmxManageGPU.cmake
@@ -143,12 +143,10 @@ if (GMX_GPU)
     if (DEFINED NVML_LIBRARY)
         set(NVML_FIND_QUIETLY TRUE)
     endif()
-
+    find_package(NVML)
+    option(GMX_USE_NVML "Use NVML support for better CUDA performance" ${NVML_FOUND})
+    mark_as_advanced(GMX_USE_NVML)
     if(GMX_USE_NVML)
-        find_package(NVML)
-        option(GMX_USE_NVML "Use NVML support for better CUDA performance" ${NVML_FOUND})
-        mark_as_advanced(GMX_USE_NVML)
-
         if(NVML_FOUND)
             include_directories(SYSTEM ${NVML_INCLUDE_DIR})
             set(HAVE_NVML 1)