From f9ef92d45af6d2c2ef9b1dd1ca9cd5b6b93ee80f Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Wed, 10 Aug 2011 12:49:52 +0000 Subject: [PATCH] multilib support added (ticket #363) --- CMakeLists.txt | 4 ++-- modules/gpu/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 33519f1d8a..22562a4dc6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,7 +131,7 @@ endif() if(ANDROID) set(OPENCV_LIB_INSTALL_PATH libs/${ARMEABI_NDK_NAME}) else() - set(OPENCV_LIB_INSTALL_PATH lib) + set(OPENCV_LIB_INSTALL_PATH lib${LIB_SUFFIX}) endif() set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${OPENCV_LIB_INSTALL_PATH}") @@ -1445,7 +1445,7 @@ endif(ANDROID) # ------------------------------------------------------------------------------------------- set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix "\${prefix}") -set(libdir "\${exec_prefix}/lib") +set(libdir "\${exec_prefix}/lib${LIB_SUFFIX}") set(includedir "\${prefix}/${OPENCV_INCLUDE_PREFIX}") set(VERSION ${OPENCV_VERSION}) diff --git a/modules/gpu/CMakeLists.txt b/modules/gpu/CMakeLists.txt index eaa47a0f3f..b9f36664f2 100644 --- a/modules/gpu/CMakeLists.txt +++ b/modules/gpu/CMakeLists.txt @@ -141,8 +141,8 @@ add_dependencies(${the_target} ${DEPS}) install(TARGETS ${the_target} RUNTIME DESTINATION bin COMPONENT main - LIBRARY DESTINATION lib COMPONENT main - ARCHIVE DESTINATION lib COMPONENT main) + LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main + ARCHIVE DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main) install(FILES ${lib_hdrs} DESTINATION ${OPENCV_INCLUDE_PREFIX}/opencv2/${name}