mirror of
https://github.com/opencv/opencv_contrib.git
synced 2025-10-20 04:25:42 +08:00
ovis: allow using OGRE devel
only compatible versions support CMake CONFIG mode. Use that to make check more robust.
This commit is contained in:
@@ -1,11 +1,11 @@
|
|||||||
set(the_description "OGRE 3D Visualiser.")
|
set(the_description "OGRE 3D Visualiser.")
|
||||||
|
|
||||||
find_package(OGRE QUIET)
|
find_package(OGRE QUIET CONFIG)
|
||||||
|
|
||||||
if(NOT OGRE_FOUND)
|
if(NOT OGRE_FOUND)
|
||||||
message(STATUS "Module opencv_ovis disabled because OGRE3D was not found")
|
message(STATUS "Module opencv_ovis disabled because OGRE3D was not found")
|
||||||
ocv_module_disable(ovis)
|
ocv_module_disable(ovis)
|
||||||
elseif(OGRE_VERSION VERSION_LESS 1.11.5 OR OGRE_VERSION VERSION_GREATER 2.0)
|
elseif(OGRE_VERSION VERSION_LESS 1.11.5)
|
||||||
message(STATUS "Module opencv_ovis disabled because of incompatible OGRE3D version (${OGRE_VERSION})")
|
message(STATUS "Module opencv_ovis disabled because of incompatible OGRE3D version (${OGRE_VERSION})")
|
||||||
ocv_module_disable(ovis)
|
ocv_module_disable(ovis)
|
||||||
else() # we need C++11 for OGRE 1.11
|
else() # we need C++11 for OGRE 1.11
|
||||||
|
Reference in New Issue
Block a user