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
Container Registry
Model registry
Operate
Environments
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
Main Repositories
otb
Commits
7405f246
Commit
7405f246
authored
6 years ago
by
Guillaume Pasero
Browse files
Options
Downloads
Patches
Plain Diff
BUG:
#1707
: fix OpenCV compilation with GCC 7
parent
fa93eaec
No related branches found
No related tags found
1 merge request
!220
Resolve "SuperBuild - OpenCV compilation"
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
SuperBuild/patches/OPENCV/opencv-2-compiler-check-all.diff
+14
-0
14 additions, 0 deletions
SuperBuild/patches/OPENCV/opencv-2-compiler-check-all.diff
with
14 additions
and
0 deletions
SuperBuild/patches/OPENCV/opencv-2-compiler-check-all.diff
0 → 100644
+
14
−
0
View file @
7405f246
diff -burN OPENCV-orig/cmake/OpenCVDetectCXXCompiler.cmake OPENCV/cmake/OpenCVDetectCXXCompiler.cmake
--- OPENCV-orig/cmake/OpenCVDetectCXXCompiler.cmake 2018-09-05 09:39:36.254808812 +0200
+++ OPENCV/cmake/OpenCVDetectCXXCompiler.cmake 2018-09-05 09:44:19.273777344 +0200
@@ -77,6 +77,10 @@
# Split the three parts:
string(REGEX MATCHALL "[0-9]+" CMAKE_OPENCV_GCC_VERSIONS "${CMAKE_GCC_REGEX_VERSION}")
+ list(LENGTH CMAKE_OPENCV_GCC_VERSIONS CMAKE_OPENCV_GCC_VERSIONS_LENGTH)
+ if(${CMAKE_OPENCV_GCC_VERSIONS_LENGTH} LESS 2)
+ string(REGEX MATCHALL "[0-9]+" CMAKE_OPENCV_GCC_VERSIONS "${CMAKE_CXX_COMPILER_VERSION}")
+ endif()
list(GET CMAKE_OPENCV_GCC_VERSIONS 0 CMAKE_OPENCV_GCC_VERSION_MAJOR)
list(GET CMAKE_OPENCV_GCC_VERSIONS 1 CMAKE_OPENCV_GCC_VERSION_MINOR)
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