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

Fixed Android install target

Browse Source
This commit is contained in:
Andrey Kamaev 2011-06-17 11:10:35 +00:00
parent d84b5a9b36
commit 6e8b4e646a
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -1167,10 +1167,10 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINA
# ------------------------------------------------------------------------------------------- # -------------------------------------------------------------------------------------------
# Set CMAKE_INCLUDE_DIRS_CONFIGCMAKE to the list of include directories: # Set CMAKE_INCLUDE_DIRS_CONFIGCMAKE to the list of include directories:
set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/include/opencv" "${CMAKE_INSTALL_PREFIX}/include") set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "\"\${THIS_OPENCV_CONFIG_PATH}/../../include/opencv" "\${THIS_OPENCV_CONFIG_PATH}/../../include\"")
set(CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE "\"\"") set(CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE "\"\"")
set(CMAKE_LIB_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/lib") set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${THIS_OPENCV_CONFIG_PATH}/../../lib\"")
exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/unix-install/\"" OUTPUT_VARIABLE RET_VAL) exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/unix-install/\"" OUTPUT_VARIABLE RET_VAL)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" IMMEDIATE @ONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)

30
OpenCVConfig.cmake.in
View File

@ -91,14 +91,10 @@ endif(NOT @CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE@ STREQUAL "")
# many more dependencies: # many more dependencies:
IF (NOT @BUILD_SHARED_LIBS@) IF (NOT @BUILD_SHARED_LIBS@)
# Under static libs, the user of OpenCV needs access to the 3rdparty libs as well: # Under static libs, the user of OpenCV needs access to the 3rdparty libs as well:
LINK_DIRECTORIES(@CMAKE_LIB_DIRS_CONFIGCMAKE@/../3rdparty/lib) if(WIN32 AND NOT ANDROID)
if(WIN32)
LINK_DIRECTORIES(@CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE@/3rdparty/lib) LINK_DIRECTORIES(@CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE@/3rdparty/lib)
elseif(ANDROID)
LINK_DIRECTORIES(@CMAKE_BINARY_DIR@/3rdparty/lib)
LINK_DIRECTORIES(@CMAKE_LIB_DIRS_CONFIGCMAKE@/3rdparty/lib)
else() else()
LINK_DIRECTORIES(@CMAKE_LIB_DIRS_CONFIGCMAKE@/../share/opencv/3rdparty/lib) LINK_DIRECTORIES("${THIS_OPENCV_CONFIG_PATH}/3rdparty/lib")
endif() endif()
set(OpenCV_LIBS @OPENCV_LINKER_LIBS@ @IPP_LIBS@ @HIGHGUI_LIBRARIES@ ${OpenCV_LIBS}) set(OpenCV_LIBS @OPENCV_LINKER_LIBS@ @IPP_LIBS@ @HIGHGUI_LIBRARIES@ ${OpenCV_LIBS})
@ -122,16 +118,18 @@ ENDIF(NOT @BUILD_SHARED_LIBS@)
# ====================================================== # ======================================================
IF (ANDROID) IF (ANDROID)
macro( COPY_NATIVE_CAMERA_LIBS target ) macro( COPY_NATIVE_CAMERA_LIBS target )
get_target_property(target_location ${target} LOCATION) IF( ARMEABI_V7A)
get_filename_component(target_location "${target_location}" PATH) get_target_property(target_location ${target} LOCATION)
file(GLOB camera_wrappers "${OpenCV_LIB_DIR}/libnative_camera_r*.so") get_filename_component(target_location "${target_location}" PATH)
foreach(wrapper ${camera_wrappers}) file(GLOB camera_wrappers "${OpenCV_LIB_DIR}/libnative_camera_r*.so")
ADD_CUSTOM_COMMAND( foreach(wrapper ${camera_wrappers})
TARGET ${target} ADD_CUSTOM_COMMAND(
POST_BUILD TARGET ${target}
COMMAND ${CMAKE_COMMAND} -E copy "${wrapper}" "${target_location}" POST_BUILD
) COMMAND ${CMAKE_COMMAND} -E copy "${wrapper}" "${target_location}"
endforeach() )
endforeach()
ENDIF( ARMEABI_V7A )
endmacro() endmacro()
ENDIF(ANDROID) ENDIF(ANDROID)

4
modules/androidcamera/CMakeLists.txt
View File

@ -45,4 +45,8 @@ foreach(wrapper ${camera_wrappers})
POST_BUILD POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy "${wrapper}" "${LIBRARY_OUTPUT_PATH}" COMMAND ${CMAKE_COMMAND} -E copy "${wrapper}" "${LIBRARY_OUTPUT_PATH}"
) )
get_filename_component(wrapper_name "${wrapper}" NAME)
install(FILES "${LIBRARY_OUTPUT_PATH}/${wrapper_name}"
DESTINATION lib
COMPONENT main)
endforeach() endforeach()