You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
25 lines
1.2 KiB
25 lines
1.2 KiB
--- ./CMakeLists.txt.orig 2018-02-27 01:46:32.259819239 +0000
|
|
+++ ./CMakeLists.txt 2018-02-27 19:48:19.658736383 +0000
|
|
@@ -439,19 +439,14 @@ else()
|
|
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})
|
|
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)
|
|
- endif()
|
|
+ ocv_update(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/OpenCV)
|
|
endif()
|
|
endif()
|
|
ocv_update(OPENCV_INCLUDE_INSTALL_PATH "include")
|