Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv_contrib
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv_contrib
Commits
82f3da5e
Commit
82f3da5e
authored
Oct 13, 2019
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2292 from huangqinjin:master
parents
83e98d24
db647875
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
7 deletions
+3
-7
CMakeLists.txt
modules/ovis/CMakeLists.txt
+3
-7
No files found.
modules/ovis/CMakeLists.txt
View file @
82f3da5e
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.1
0
OR OGRE_VERSION VERSION_GREATER 2.0
)
elseif
(
OGRE_VERSION VERSION_LESS 1.1
1.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
)
else
if
(
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
}
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment