File tree 1 file changed +3
-2
lines changed
1 file changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -415,7 +415,8 @@ else()
415
415
ocv_update(OPENCV_OTHER_INSTALL_PATH etc)
416
416
ocv_update(OPENCV_CONFIG_INSTALL_PATH "." )
417
417
else ()
418
- ocv_update(OPENCV_LIB_INSTALL_PATH lib${LIB_SUFFIX} )
418
+ include (GNUInstallDirs)
419
+ ocv_update(OPENCV_LIB_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX} )
419
420
ocv_update(OPENCV_3P_LIB_INSTALL_PATH share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH} )
420
421
ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH share/OpenCV/samples)
421
422
ocv_update(OPENCV_JAR_INSTALL_PATH share/OpenCV/java)
@@ -424,7 +425,7 @@ else()
424
425
if (NOT DEFINED OPENCV_CONFIG_INSTALL_PATH)
425
426
math (EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P} " )
426
427
if (LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
427
- ocv_update(OPENCV_CONFIG_INSTALL_PATH lib ${LIB_SUFFIX} /cmake/opencv)
428
+ ocv_update(OPENCV_CONFIG_INSTALL_PATH ${CMAKE_INSTALL_LIBDIR} ${LIB_SUFFIX} /cmake/opencv)
428
429
else ()
429
430
ocv_update(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
430
431
endif ()
You can’t perform that action at this time.
0 commit comments