mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-29 13:00:32 +01:00
43 lines
1.8 KiB
Diff
43 lines
1.8 KiB
Diff
--- CMakeLists.txt.orig 2018-08-28 22:58:21.000000000 +1000
|
|
+++ CMakeLists.txt 2018-08-31 07:58:34.745000000 +1000
|
|
@@ -374,7 +374,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)
|
|
@@ -415,7 +415,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)
|
|
@@ -446,17 +446,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()
|