Skip to content

O
opencv
Commit 36dfb71c authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #13619 from alalek:issue_13595

parents 4ced27e1 6bd5d7f0
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
CMakeLists.txt
View file @ 36dfb71c
...@@ -592,7 +592,7 @@ else() ...@@ -592,7 +592,7 @@ else()
ocv_update(OPENCV_CONFIG_INSTALL_PATH ".") ocv_update(OPENCV_CONFIG_INSTALL_PATH ".")
else() else()
include(GNUInstallDirs) 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_3P_LIB_INSTALL_PATH share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH share/OpenCV/samples) ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH share/OpenCV/samples)
ocv_update(OPENCV_JAR_INSTALL_PATH share/OpenCV/java) ocv_update(OPENCV_JAR_INSTALL_PATH share/OpenCV/java)
...@@ -601,7 +601,7 @@ else() ...@@ -601,7 +601,7 @@ else()
if(NOT DEFINED OPENCV_CONFIG_INSTALL_PATH) if(NOT DEFINED OPENCV_CONFIG_INSTALL_PATH)
math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}") math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX) 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) ocv_update(OPENCV_CONFIG_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}/cmake/opencv)
else() else()
ocv_update(OPENCV_CONFIG_INSTALL_PATH share/OpenCV) ocv_update(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
endif() endif()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment