summaryrefslogtreecommitdiff
path: root/libraries/opencv/patch_fsh-3.4.1.diff
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/opencv/patch_fsh-3.4.1.diff')
-rw-r--r--libraries/opencv/patch_fsh-3.4.1.diff43
1 files changed, 43 insertions, 0 deletions
diff --git a/libraries/opencv/patch_fsh-3.4.1.diff b/libraries/opencv/patch_fsh-3.4.1.diff
new file mode 100644
index 0000000000..be539bfa84
--- /dev/null
+++ b/libraries/opencv/patch_fsh-3.4.1.diff
@@ -0,0 +1,43 @@
+--- CMakeLists.txt.orig 2018-02-23 18:38:33.000000000 +1000
++++ CMakeLists.txt 2018-03-07 07:55:12.521997610 +1000
+@@ -368,7 +368,7 @@
+ if(ANDROID OR WIN32)
+ ocv_update(OPENCV_DOC_INSTALL_PATH doc)
+ else()
+- ocv_update(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc)
++ ocv_update(OPENCV_DOC_INSTALL_PATH share/opencv/doc)
+ endif()
+
+ if(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
+@@ -409,7 +409,7 @@
+ elseif(WIN32)
+ ocv_update(OPENCV_TEST_DATA_INSTALL_PATH "testdata")
+ else()
+- ocv_update(OPENCV_TEST_DATA_INSTALL_PATH "share/OpenCV/testdata")
++ ocv_update(OPENCV_TEST_DATA_INSTALL_PATH "share/opencv/testdata")
+ endif()
+
+ if(ANDROID)
+@@ -440,17 +440,17 @@
+ else()
+ include(GNUInstallDirs)
+ ocv_update(OPENCV_LIB_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX})
+- ocv_update(OPENCV_3P_LIB_INSTALL_PATH share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
+- ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH share/OpenCV/samples)
+- ocv_update(OPENCV_JAR_INSTALL_PATH share/OpenCV/java)
+- ocv_update(OPENCV_OTHER_INSTALL_PATH share/OpenCV)
++ ocv_update(OPENCV_3P_LIB_INSTALL_PATH share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH})
++ ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH share/opencv/samples)
++ ocv_update(OPENCV_JAR_INSTALL_PATH share/opencv/java)
++ ocv_update(OPENCV_OTHER_INSTALL_PATH share/opencv)
+
+ if(NOT DEFINED OPENCV_CONFIG_INSTALL_PATH)
+ math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
+ if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
+ ocv_update(OPENCV_CONFIG_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}/cmake/opencv)
+ else()
+- ocv_update(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
++ ocv_update(OPENCV_CONFIG_INSTALL_PATH share/opencv)
+ endif()
+ endif()
+ endif()