ovis: cmake: extend compatibility check and allow using OGRE1.11 (devel)

pull/1555/head
Pavel Rojtberg 7 years ago
parent c80fdd3ee6
commit 0520753dc1
  1. 10
      modules/ovis/CMakeLists.txt

@ -5,9 +5,15 @@ find_package(OGRE 1.10 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)
message(STATUS "Module opencv_ovis disabled because OGRE3D version is less than 1.10 (${OGRE_VERSION})")
elseif(OGRE_VERSION VERSION_LESS 1.10 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
if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qstd=c++11")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
endif()
endif()
include_directories(${OGRE_INCLUDE_DIRS}})

Loading…
Cancel
Save