Skip to content
Snippets Groups Projects
Commit 1f5a4b3f authored by Rashad Kanavath's avatar Rashad Kanavath
Browse files

Merge branch '1727-update-patch-for-opencv-in-superbuild' into 'develop'

Resolve "update patch for opencv in superbuild"

Closes #1727

See merge request orfeotoolbox/otb!247
parents 983daa28 89c4abd9
No related branches found
No related tags found
No related merge requests found
diff -burN opencv-2.4.13.2.orig/CMakeLists.txt opencv-2.4.13.2/CMakeLists.txt diff -burN opencv-3.4.1.orig/CMakeLists.txt opencv-3.4.1/CMakeLists.txt
--- opencv-2.4.13.2.orig/CMakeLists.txt 2017-04-25 14:05:11.148414719 +0200 --- opencv-3.4.1.orig/CMakeLists.txt Wed Sep 26 15:10:50 2018
+++ opencv-2.4.13.2/CMakeLists.txt 2017-04-25 14:06:05.944787632 +0200 +++ opencv-3.4.1/CMakeLists.txt Wed Sep 26 15:12:40 2018
@@ -290,7 +290,9 @@ @@ -373,7 +373,7 @@
if(WIN32) if(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH) if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH)
- set(OpenCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/") - ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
+ #OTB PATCH [BEGIN] + ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "") #${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
+ set(OpenCV_INSTALL_BINARIES_PREFIX "") # "${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
+ #OTB PATCH [END]
else() else()
message(STATUS "Can't detect runtime and/or arch") message(STATUS "Can't detect runtime and/or arch")
set(OpenCV_INSTALL_BINARIES_PREFIX "") ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "")
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment