projects / packages / opencv.git / blame
| Commit | Line | Data |
|---|---|---|
| fbba7aaa JR |
1 | From c7b27f8e77e673aa2cb2b9be69f908c464ab5d91 Mon Sep 17 00:00:00 2001 |
| 2 | From: Pavel Rojtberg <rojtberg@gmail.com> | |
| 3 | Date: Mon, 10 May 2021 20:23:46 +0200 | |
| 4 | Subject: [PATCH] ovis: allow using OGRE devel | |
| 5 | ||
| 6 | only compatible versions support CMake CONFIG mode. | |
| 7 | Use that to make check more robust. | |
| 8 | --- | |
| 9 | modules/ovis/CMakeLists.txt | 4 ++-- | |
| 10 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
| 11 | ||
| 12 | diff --git a/modules/ovis/CMakeLists.txt b/modules/ovis/CMakeLists.txt | |
| 13 | index dc190da980b..912b86a590d 100644 | |
| 14 | --- a/modules/ovis/CMakeLists.txt | |
| 15 | +++ b/modules/ovis/CMakeLists.txt | |
| 16 | @@ -1,11 +1,11 @@ | |
| 17 | set(the_description "OGRE 3D Visualiser.") | |
| 18 | ||
| 19 | -find_package(OGRE QUIET) | |
| 20 | +find_package(OGRE QUIET CONFIG) | |
| 21 | ||
| 22 | if(NOT OGRE_FOUND) | |
| 23 | message(STATUS "Module opencv_ovis disabled because OGRE3D was not found") | |
| 24 | ocv_module_disable(ovis) | |
| 25 | -elseif(OGRE_VERSION VERSION_LESS 1.11.5 OR OGRE_VERSION VERSION_GREATER 2.0) | |
| 26 | +elseif(OGRE_VERSION VERSION_LESS 1.11.5) | |
| 27 | message(STATUS "Module opencv_ovis disabled because of incompatible OGRE3D version (${OGRE_VERSION})") | |
| 28 | ocv_module_disable(ovis) | |
| 29 | else() # we need C++11 for OGRE 1.11 |