Fixes/Refactorings to CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63df9d13a413b52ac35465d0b17471ca092c6be7..75a174714f57229407f767716ec9bd85e09a69a2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,12 +18,14 @@ if(NOT DEFINED CMAKE_BUILD_TYPE OR NOT CMAKE_BUILD_TYPE)
 endif()
 
 find_package(Threads REQUIRED)
-if(NOT DEFINED DISABLE_OPENCL)
-    find_package(OpenCL QUIET)
+if(NOT DEFINED DISABLE_OPENCL OR NOT DISABLE_OPENCL)
+    find_package(OpenCL)
     if(NOT DEFINED OpenCL_FOUND)
         set(DISABLE_OPENCL True)
         message(WARNING "OpenCL not found, OpenCL usage is disabled.")
     endif()
+else()
+    message(STATUS "Not checking for OpenCL")
 endif()
 find_package(PNG REQUIRED)