generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

multilib support added (ticket #363)

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-08-10 12:49:52 +00:00
parent 645bb0bfbc
commit f9ef92d45a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -131,7 +131,7 @@ endif()
if(ANDROID) if(ANDROID)
set(OPENCV_LIB_INSTALL_PATH libs/${ARMEABI_NDK_NAME}) set(OPENCV_LIB_INSTALL_PATH libs/${ARMEABI_NDK_NAME})
else() else()
set(OPENCV_LIB_INSTALL_PATH lib) set(OPENCV_LIB_INSTALL_PATH lib${LIB_SUFFIX})
endif() endif()
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${OPENCV_LIB_INSTALL_PATH}") set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${OPENCV_LIB_INSTALL_PATH}")
@ -1445,7 +1445,7 @@ endif(ANDROID)
# ------------------------------------------------------------------------------------------- # -------------------------------------------------------------------------------------------
set(prefix ${CMAKE_INSTALL_PREFIX}) set(prefix ${CMAKE_INSTALL_PREFIX})
set(exec_prefix "\${prefix}") set(exec_prefix "\${prefix}")
set(libdir "\${exec_prefix}/lib") set(libdir "\${exec_prefix}/lib${LIB_SUFFIX}")
set(includedir "\${prefix}/${OPENCV_INCLUDE_PREFIX}") set(includedir "\${prefix}/${OPENCV_INCLUDE_PREFIX}")
set(VERSION ${OPENCV_VERSION}) set(VERSION ${OPENCV_VERSION})

4
modules/gpu/CMakeLists.txt
View File

@ -141,8 +141,8 @@ add_dependencies(${the_target} ${DEPS})
install(TARGETS ${the_target} install(TARGETS ${the_target}
RUNTIME DESTINATION bin COMPONENT main RUNTIME DESTINATION bin COMPONENT main
LIBRARY DESTINATION lib COMPONENT main LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main
ARCHIVE DESTINATION lib COMPONENT main) ARCHIVE DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main)
install(FILES ${lib_hdrs} install(FILES ${lib_hdrs}
DESTINATION ${OPENCV_INCLUDE_PREFIX}/opencv2/${name} DESTINATION ${OPENCV_INCLUDE_PREFIX}/opencv2/${name}