Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
eos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Richard Torenvliet
eos
Commits
acdb8bfc
Commit
acdb8bfc
authored
Feb 19, 2017
by
Patrik Huber
Committed by
GitHub
Feb 19, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Re-added checking for OpenCV >2.4.3
parent
52663726
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
utils/CMakeLists.txt
utils/CMakeLists.txt
+1
-1
No files found.
utils/CMakeLists.txt
View file @
acdb8bfc
...
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 2.8.12)
...
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 2.8.12)
#version variable is defined from project root's CMakeLists
#version variable is defined from project root's CMakeLists
if
(
"
${
OpenCV_VERSION_MAJOR
}
$"
EQUAL 2
)
if
(
"
${
OpenCV_VERSION_MAJOR
}
$"
EQUAL 2
)
message
(
STATUS
"OpenCV 2.x detected"
)
message
(
STATUS
"OpenCV 2.x detected"
)
find_package
(
OpenCV 2 REQUIRED core imgproc highgui
)
find_package
(
OpenCV 2
.4.3
REQUIRED core imgproc highgui
)
elseif
(
"
${
OpenCV_VERSION_MAJOR
}
$"
EQUAL 3
)
elseif
(
"
${
OpenCV_VERSION_MAJOR
}
$"
EQUAL 3
)
message
(
STATUS
"OpenCV 3.x detected - including imgcodecs for compatibility"
)
message
(
STATUS
"OpenCV 3.x detected - including imgcodecs for compatibility"
)
find_package
(
OpenCV 3 REQUIRED core imgproc imgcodecs
)
find_package
(
OpenCV 3 REQUIRED core imgproc imgcodecs
)
...
...
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