diff options
author | Christoph Willing <chris.willing@linux.com> | 2018-07-13 19:00:39 +1000 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2018-07-14 06:55:52 +0700 |
commit | 89a464fcdc4e49debd78104a005c924bb49daf41 (patch) | |
tree | 2612f81b2591d8ecb48d95ae3f46d3e66c927ec5 /libraries/opencv/patch_fsh-3.4.2.diff | |
parent | fb3065d67c85cad4e95e6f997be3048f8358a662 (diff) | |
download | slackbuilds-89a464fcdc4e49debd78104a005c924bb49daf41.tar.gz |
libraries/opencv: Fix library paths
Signed-off-by: Christoph Willing <chris.willing@linux.com>
Diffstat (limited to 'libraries/opencv/patch_fsh-3.4.2.diff')
-rw-r--r-- | libraries/opencv/patch_fsh-3.4.2.diff | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libraries/opencv/patch_fsh-3.4.2.diff b/libraries/opencv/patch_fsh-3.4.2.diff index 9a865ff73c..79771905bb 100644 --- a/libraries/opencv/patch_fsh-3.4.2.diff +++ b/libraries/opencv/patch_fsh-3.4.2.diff @@ -1,5 +1,5 @@ --- CMakeLists.txt.orig 2018-07-04 21:05:47.000000000 +1000 -+++ CMakeLists.txt 2018-07-06 08:04:47.804000000 +1000 ++++ CMakeLists.txt 2018-07-12 21:54:32.406498966 +1000 @@ -374,7 +374,7 @@ if(ANDROID OR WIN32) ocv_update(OPENCV_DOC_INSTALL_PATH doc) @@ -18,14 +18,16 @@ endif() if(ANDROID) -@@ -446,17 +446,17 @@ +@@ -445,18 +445,18 @@ + ocv_update(OPENCV_CONFIG_INSTALL_PATH ".") else() include(GNUInstallDirs) - ocv_update(OPENCV_LIB_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}) +- 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_LIB_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}) + 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) |