Fix opencv version verification
This commit is contained in:
1 parent
e18558eb46
commit
8db32e32c5
3 files changed
+6
-9
No files matched your search
@@ -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()
|
||||
|
||||
|
||||
Reference in new issue
Block a user