|
5172
|
1 Common subdirectories: opencv-3.4.3.orig/3rdparty and opencv-3.4.3/3rdparty |
|
|
2 Common subdirectories: opencv-3.4.3.orig/apps and opencv-3.4.3/apps |
|
|
3 Common subdirectories: opencv-3.4.3.orig/cmake and opencv-3.4.3/cmake |
|
|
4 diff -ut opencv-3.4.3.orig/CMakeLists.txt opencv-3.4.3/CMakeLists.txt |
|
|
5 --- opencv-3.4.3.orig/CMakeLists.txt 2019-10-02 15:01:47.179900886 -0400 |
|
|
6 +++ opencv-3.4.3/CMakeLists.txt 2019-10-02 15:19:18.363163935 -0400 |
|
|
7 @@ -39,7 +39,7 @@ |
|
|
8 if(NOT CMAKE_TOOLCHAIN_FILE) |
|
|
9 # it _must_ go before project(OpenCV) in order to work |
|
|
10 if(WIN32) |
|
|
11 - set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation Directory") |
|
|
12 + #set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation Directory") |
|
|
13 else() |
|
|
14 set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Installation Directory") |
|
|
15 endif() |
|
|
16 @@ -47,7 +47,7 @@ |
|
|
17 #Android: set output folder to ${CMAKE_BINARY_DIR} |
|
|
18 set(LIBRARY_OUTPUT_PATH_ROOT ${CMAKE_BINARY_DIR} CACHE PATH "root for library output, set this to change where android libs are compiled to" ) |
|
|
19 # any cross-compiling |
|
|
20 - set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation Directory") |
|
|
21 + #set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation Directory") |
|
|
22 endif() |
|
|
23 endif() |
|
|
24 |
|
|
25 @@ -377,14 +377,7 @@ |
|
|
26 ocv_update(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc) |
|
|
27 endif() |
|
|
28 |
|
|
29 -if(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows) |
|
|
30 - if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH) |
|
|
31 - ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/") |
|
|
32 - else() |
|
|
33 - message(STATUS "Can't detect runtime and/or arch") |
|
|
34 - ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "") |
|
|
35 - endif() |
|
|
36 -elseif(ANDROID) |
|
|
37 +if(ANDROID) |
|
|
38 ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "sdk/native/") |
|
|
39 else() |
|
|
40 ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "") |
|
|
41 @@ -433,11 +426,8 @@ |
|
|
42 ocv_update(3P_LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/3rdparty/lib${LIB_SUFFIX}") |
|
|
43 |
|
|
44 if(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows) |
|
|
45 - if(OpenCV_STATIC) |
|
|
46 - ocv_update(OPENCV_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}staticlib${LIB_SUFFIX}") |
|
|
47 - else() |
|
|
48 - ocv_update(OPENCV_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}lib${LIB_SUFFIX}") |
|
|
49 - endif() |
|
|
50 + ocv_update(OPENCV_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}lib${LIB_SUFFIX}") |
|
|
51 + ocv_update(OPENCV_3P_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}lib${LIB_SUFFIX}") |
|
|
52 ocv_update(OPENCV_3P_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}staticlib${LIB_SUFFIX}") |
|
|
53 ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH samples) |
|
|
54 ocv_update(OPENCV_JAR_INSTALL_PATH java) |
|
|
55 @@ -495,15 +485,9 @@ |
|
|
56 set(OPENCV_LIB_ARCHIVE_INSTALL_PATH ${OPENCV_LIB_INSTALL_PATH}) |
|
|
57 endif() |
|
|
58 |
|
|
59 -if(WIN32) |
|
|
60 - # Postfix of DLLs: |
|
|
61 - set(OPENCV_DLLVERSION "${OPENCV_VERSION_MAJOR}${OPENCV_VERSION_MINOR}${OPENCV_VERSION_PATCH}") |
|
|
62 - set(OPENCV_DEBUG_POSTFIX d) |
|
|
63 -else() |
|
|
64 - # Postfix of so's: |
|
|
65 - set(OPENCV_DLLVERSION "") |
|
|
66 - set(OPENCV_DEBUG_POSTFIX "") |
|
|
67 -endif() |
|
|
68 +# Postfix of so's: |
|
|
69 +set(OPENCV_DLLVERSION "") |
|
|
70 +set(OPENCV_DEBUG_POSTFIX "") |
|
|
71 |
|
|
72 if(DEFINED CMAKE_DEBUG_POSTFIX) |
|
|
73 set(OPENCV_DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") |
|
|
74 Common subdirectories: opencv-3.4.3.orig/data and opencv-3.4.3/data |
|
|
75 Common subdirectories: opencv-3.4.3.orig/doc and opencv-3.4.3/doc |
|
|
76 Common subdirectories: opencv-3.4.3.orig/include and opencv-3.4.3/include |
|
|
77 Common subdirectories: opencv-3.4.3.orig/modules and opencv-3.4.3/modules |
|
|
78 Common subdirectories: opencv-3.4.3.orig/platforms and opencv-3.4.3/platforms |
|
|
79 Common subdirectories: opencv-3.4.3.orig/samples and opencv-3.4.3/samples |
