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 Cabieces
otb
Commits
89c4abd9
Commit
89c4abd9
authored
6 years ago
by
Rashad Kanavath
Browse files
Options
Downloads
Patches
Plain Diff
SuperBuild: update patch for opencv
parent
b83b4cf3
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
SuperBuild/patches/OPENCV/opencv-1-install-prefix-win.diff
+8
-10
8 additions, 10 deletions
SuperBuild/patches/OPENCV/opencv-1-install-prefix-win.diff
with
8 additions
and
10 deletions
SuperBuild/patches/OPENCV/opencv-1-install-prefix-win.diff
+
8
−
10
View file @
89c4abd9
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 "")
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