diff --git a/libhmsbeagle/GPU/CMakeLists.txt b/libhmsbeagle/GPU/CMakeLists.txt
index 22b3c1ef..68b1b5a3 100644
--- a/libhmsbeagle/GPU/CMakeLists.txt
+++ b/libhmsbeagle/GPU/CMakeLists.txt
@@ -1,13 +1,17 @@
 
-find_package(OpenCL)
-if(OpenCL_FOUND AND BUILD_OPENCL)
-    message(STATUS "OpenCL Includes: ${OpenCL_INCLUDE_DIRS}")
-    message(STATUS "OpenCL Libraries: ${OpenCL_LIBRARIES}")
-    add_subdirectory("CMake_OpenCL")
-endif(OpenCL_FOUND AND BUILD_OPENCL)
+if(BUILD_OPENCL)
+	find_package(OpenCL)
+	if(OpenCL_FOUND)
+		message(STATUS "OpenCL Includes: ${OpenCL_INCLUDE_DIRS}")
+		message(STATUS "OpenCL Libraries: ${OpenCL_LIBRARIES}")
+		add_subdirectory("CMake_OpenCL")
+	endif(OpenCL_FOUND)
+endif(BUILD_OPENCL)
 
-find_package(CUDA)
-if(CUDA_FOUND AND BUILD_CUDA)
-    message(STATUS "CUDA Includes: ${CUDA_INCLUDE_DIRS}")
-    add_subdirectory("CMake_CUDA")
-endif(CUDA_FOUND AND BUILD_CUDA)
+if(BUILD_CUDA)
+	find_package(CUDA)
+	if(CUDA_FOUND)
+		message(STATUS "CUDA Includes: ${CUDA_INCLUDE_DIRS}")
+		add_subdirectory("CMake_CUDA")
+	endif(CUDA_FOUND)
+endif(BUILD_CUDA)