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
Merge requests
!247
Resolve "update patch for opencv in superbuild"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "update patch for opencv in superbuild"
1727-update-patch-for-opencv-in-superbuild
into
develop
Overview
1
Commits
1
Pipelines
0
Changes
1
Merged
Rashad Kanavath
requested to merge
1727-update-patch-for-opencv-in-superbuild
into
develop
6 years ago
Overview
1
Commits
1
Pipelines
0
Changes
1
Expand
Closes
#1727 (closed)
Edited
6 years ago
by
Rashad Kanavath
2
0
Merge request reports
Compare
develop
develop (base)
and
latest version
latest version
89c4abd9
1 commit,
6 years ago
1 file
+
8
−
10
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
SuperBuild/patches/OPENCV/opencv-1-install-prefix-win.diff
+
8
−
10
Options
diff -burN opencv-
2
.4.1
3.2
.orig/CMakeLists.txt opencv-
2
.4.1
3.2
/CMakeLists.txt
--- opencv-
2
.4.1
3.2
.orig/CMakeLists.txt
2017-04-25 14:05:11.148414719 +0200
+++ opencv-
2
.4.1
3.2
/CMakeLists.txt
2017-04-25 14:06:05.944787632 +0200
@@ -
290
,7 +
290,9
@@
diff -burN opencv-
3
.4.1.orig/CMakeLists.txt opencv-
3
.4.1/CMakeLists.txt
--- opencv-
3
.4.1.orig/CMakeLists.txt
Wed Sep 26 15:10:50 2018
+++ opencv-
3
.4.1/CMakeLists.txt
Wed Sep 26 15:12:40 2018
@@ -
373
,7 +
373,7
@@
if(WIN32)
if(WIN32
AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows
)
if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH)
- set(OpenCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
+ #OTB PATCH [BEGIN]
+ set(OpenCV_INSTALL_BINARIES_PREFIX "") # "${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
+ #OTB PATCH [END]
- ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
+ ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "") #${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
else()
message(STATUS "Can't detect runtime and/or arch")
set
(OpenCV_INSTALL_BINARIES_PREFIX "")
ocv_update
(OpenCV_INSTALL_BINARIES_PREFIX "")
Loading