opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-21 23:01:45 +08:00
Code Issues Releases Wiki Activity

Merge pull request #2292 from huangqinjin:master

Browse Source
This commit is contained in:
Alexander Alekhin
2019-10-13 22:00:43 +00:00
parent 83e98d2424 db647875f2
commit 82f3da5ef1
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/ovis/CMakeLists.txt
View File

@@ -1,14 +1,14 @@
set(the_description "OGRE 3D Visualiser.") set(the_description "OGRE 3D Visualiser.")
find_package(OGRE 1.10 QUIET) find_package(OGRE QUIET)
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.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})") message(STATUS "Module opencv_ovis disabled because of incompatible OGRE3D version (${OGRE_VERSION})")
ocv_module_disable(ovis) 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) if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qstd=c++11") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qstd=c++11")
else() else()
@@ -16,10 +16,6 @@ elseif(OGRE_VERSION VERSION_GREATER 1.10) # we need C++11 for OGRE 1.11
endif() endif()
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}) include_directories(${OGRE_INCLUDE_DIRS})
link_directories(${OGRE_LIBRARY_DIRS}) link_directories(${OGRE_LIBRARY_DIRS})