From db647875f294c1a7e985673b3926ab68ec2d2704 Mon Sep 17 00:00:00 2001 From: huangqinjin Date: Sat, 12 Oct 2019 01:36:52 +0800 Subject: [PATCH] require OGRE 1.11+ for ovis --- modules/ovis/CMakeLists.txt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/ovis/CMakeLists.txt b/modules/ovis/CMakeLists.txt index 7aca87b1b..dc190da98 100644 --- a/modules/ovis/CMakeLists.txt +++ b/modules/ovis/CMakeLists.txt @@ -1,14 +1,14 @@ set(the_description "OGRE 3D Visualiser.") -find_package(OGRE 1.10 QUIET) +find_package(OGRE QUIET) if(NOT OGRE_FOUND) message(STATUS "Module opencv_ovis disabled because OGRE3D was not found") ocv_module_disable(ovis) -elseif(OGRE_VERSION VERSION_LESS 1.10 OR OGRE_VERSION VERSION_GREATER 2.0) +elseif(OGRE_VERSION VERSION_LESS 1.11.5 OR OGRE_VERSION VERSION_GREATER 2.0) message(STATUS "Module opencv_ovis disabled because of incompatible OGRE3D version (${OGRE_VERSION})") ocv_module_disable(ovis) -elseif(OGRE_VERSION VERSION_GREATER 1.10) # we need C++11 for OGRE 1.11 +else() # we need C++11 for OGRE 1.11 if(MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qstd=c++11") else() @@ -16,10 +16,6 @@ elseif(OGRE_VERSION VERSION_GREATER 1.10) # we need C++11 for OGRE 1.11 endif() endif() -if(OGRE_VERSION VERSION_LESS 1.10.10) - message(WARNING "opencv_ovis: Ogre >= 1.10.10 recommended for interactive windows") -endif() - include_directories(${OGRE_INCLUDE_DIRS}) link_directories(${OGRE_LIBRARY_DIRS})