diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6998e51..60300dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,11 +91,9 @@ SET_PACKAGE_PROPERTIES(Doxygen PROPERTIES URL "http://www.doxygen.org/" DESCRIPT
 OPTION( USE_OPENCV "Add OpenCV support" ON )
 SET( OPENCV_OPTFLOW_FOUND OFF )
 IF( USE_OPENCV )
-  FIND_PACKAGE( OpenCV REQUIRED core highgui video )
+  FIND_PACKAGE( OpenCV COMPONENTS core highgui video )
   LIST(APPEND OPENCV_MODULES core highgui video )
   SET(USE_OPENCV ${OpenCV_FOUND})
-  ## Check
-#   LIST(FIND OpenCV_LIB_COMPONENTS opencv_optflow OpenCV_optflow_FOUND)
 ENDIF()
 SET_PACKAGE_PROPERTIES(OpenCV PROPERTIES URL "http://opencv.willowgarage.com" DESCRIPTION "OpenCV library support in PlaYUVerFrame" TYPE OPTIONAL)
 
diff --git a/cmake/ModulesFct.cmake b/cmake/ModulesFct.cmake
index 2299661..e5e7c53 100644
--- a/cmake/ModulesFct.cmake
+++ b/cmake/ModulesFct.cmake
@@ -16,11 +16,11 @@ ENDMACRO()
 
 MACRO(ADD_MODULE_USE_OPENCV name file )
   IF( USE_OPENCV )
-    SET( ADD_MODULE_OPENCV_VERSION "2.4" )
-    CMAKE_PARSE_ARGUMENTS(ADD_MODULE_OPENCV "" "VERSION" "MODULES" ${ARGN} )
-    IF( NOT ( ${OpenCV_VERSION} LESS ${ADD_MODULE_OPENCV_VERSION} ) )
+    SET( ADD_MODULE_USE_OPENCV_VERSION "2.4" )
+    CMAKE_PARSE_ARGUMENTS(ADD_MODULE_USE_OPENCV "" "VERSION" "MODULES" ${ARGN} )
+    IF( NOT ( ${OpenCV_VERSION} VERSION_LESS ${ADD_MODULE_USE_OPENCV_VERSION} ) )
       SET( _HAS_MODULES TRUE )
-      FOREACH(opencv_module IN LISTS ADD_MODULE_OPENCV_MODULES )
+      FOREACH(opencv_module IN LISTS ADD_MODULE_USE_OPENCV_MODULES )
         string(TOUPPER "${opencv_module}" opencv_moduleUP)
         FIND_PACKAGE( OpenCV QUIET COMPONENTS ${opencv_module} )
         IF( NOT ${OPENCV_${opencv_moduleUP}_FOUND} EQUAL "1" )
@@ -33,7 +33,7 @@ MACRO(ADD_MODULE_USE_OPENCV name file )
       UNSET( OPENCV_${opencv_moduleUP}_FOUND )
       UNSET( _HAS_MODULES )
     ENDIF()
-    UNSET( ADD_MODULE_OPENCV_VERSION )
+    UNSET( ADD_MODULE_USE_OPENCV_VERSION )
   ENDIF()
 ENDMACRO()
 
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index 4ffaf88..8796b5c 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -41,5 +41,4 @@ ADD_MODULE_USE_OPENCV( DisparityStereoSGBM "DisparityStereoSGBM" VERSION 2.4.13.
 CREATE_MODULE_MACROS()
 INCLUDE_DIRECTORIES( ${OpenCV_INCLUDE_DIRS} )
 ADD_LIBRARY( PlaYUVerModules ${plaYUver_Mod_SRCS} )
-FIND_PACKAGE( OpenCV COMPONENTS ${OPENCV_MODULES} )
 TARGET_LINK_LIBRARIES( PlaYUVerModules PlaYUVerLib  ${OpenCV_LIBRARIES} -ldl )