diff --git a/CMakeLists.txt b/CMakeLists.txt
index a79ea804..a09b8fd0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -234,6 +234,14 @@ IF(WITH_FREENECT2)
 	      SET(freenect2_INCLUDE_DIRS ${freenect2_INCLUDE_DIR})
 	   ENDIF(NOT freenect2_INCLUDE_DIRS)
        MESSAGE(STATUS "Found freenect2: ${freenect2_INCLUDE_DIRS}")
+       # Explicitly link to OpenCL (in case of CUDA installed)
+	   FIND_PACKAGE(OpenCL QUIET)
+	   IF(OpenCL_FOUND)
+		  SET(freenect2_LIBRARIES
+			${OpenCL_LIBRARIES}
+			${freenect2_LIBRARIES}
+		  )
+	   ENDIF(OpenCL_FOUND)
     ENDIF(freenect2_FOUND)
 ENDIF(WITH_FREENECT2)
 
diff --git a/corelib/src/CMakeLists.txt b/corelib/src/CMakeLists.txt
index a444b61a..0fadce18 100644
--- a/corelib/src/CMakeLists.txt
+++ b/corelib/src/CMakeLists.txt
@@ -140,14 +140,6 @@ IF(freenect2_FOUND)
 		${LIBRARIES}
 		${freenect2_LIBRARIES}
 	)
-	# Explicitly link to OpenCL (in case of CUDA installed)
-	FIND_PACKAGE(OpenCL QUIET)
-	IF(OpenCL_FOUND)
-		SET(LIBRARIES
-			${OpenCL_LIBRARIES}
-			${LIBRARIES}
-		)
-	ENDIF(OpenCL_FOUND)
 ENDIF(freenect2_FOUND)
 
 IF(RealSense_FOUND)