Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
otb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Julien Osman
otb
Commits
651ccd64
Commit
651ccd64
authored
5 years ago
by
Cédric Traizet
Browse files
Options
Downloads
Patches
Plain Diff
REFAC: remove the OTB_OPENCV_3 cmake variable
parent
7bff53a1
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Modules/ThirdParty/OpenCV/otb-module-init.cmake
+0
-7
0 additions, 7 deletions
Modules/ThirdParty/OpenCV/otb-module-init.cmake
Modules/ThirdParty/OpenCV/src/otb_opencv_api.h.in
+0
-1
0 additions, 1 deletion
Modules/ThirdParty/OpenCV/src/otb_opencv_api.h.in
with
0 additions
and
8 deletions
Modules/ThirdParty/OpenCV/otb-module-init.cmake
+
0
−
7
View file @
651ccd64
...
@@ -26,13 +26,6 @@ if("${OpenCV_VERSION}" VERSION_LESS "2.4.0")
...
@@ -26,13 +26,6 @@ if("${OpenCV_VERSION}" VERSION_LESS "2.4.0")
"it may not be fully compatible with OTB"
)
"it may not be fully compatible with OTB"
)
endif
()
endif
()
# OTB_OPENCV_3 is true for OpenCV 3 and 4
if
(
OpenCV_VERSION_MAJOR GREATER_EQUAL 3
)
set
(
OTB_OPENCV_3 1
)
else
()
set
(
OTB_OPENCV_3 0
)
endif
()
if
(
OpenCV_VERSION_MAJOR EQUAL 4
)
if
(
OpenCV_VERSION_MAJOR EQUAL 4
)
set
(
OTB_OPENCV_4 1
)
set
(
OTB_OPENCV_4 1
)
else
()
else
()
...
...
This diff is collapsed.
Click to expand it.
Modules/ThirdParty/OpenCV/src/otb_opencv_api.h.in
+
0
−
1
View file @
651ccd64
...
@@ -20,7 +20,6 @@
...
@@ -20,7 +20,6 @@
#ifndef otb_opencv_api_h
#ifndef otb_opencv_api_h
#define otb_opencv_api_h
#define otb_opencv_api_h
#cmakedefine OTB_OPENCV_3
#cmakedefine OTB_OPENCV_4
#cmakedefine OTB_OPENCV_4
#endif
#endif
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment