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

changing package layout after 'make install' for Android build

Browse Source
This commit is contained in:
Andrey Pavlenko
2012-06-27 06:22:26 +00:00
parent 6dffc5332d
commit 3804ca3e20
20 changed files with 104 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
3rdparty/libpng/CMakeLists.txt vendored
View File

@@ -26,7 +26,7 @@ ocv_warnings_disable(CMAKE_C_FLAGS -Wcast-align)
set_target_properties(${PNG_LIBRARY}
PROPERTIES OUTPUT_NAME ${PNG_LIBRARY}
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/3rdparty/${OPENCV_LIB_INSTALL_PATH}"
ARCHIVE_OUTPUT_DIRECTORY ${3P_LIBRARY_OUTPUT_PATH}
)
if(ENABLE_SOLUTION_FOLDERS)
@@ -34,5 +34,5 @@ if(ENABLE_SOLUTION_FOLDERS)
endif()
if(NOT BUILD_SHARED_LIBS)
install(TARGETS ${PNG_LIBRARY} ARCHIVE DESTINATION share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH} COMPONENT main)
install(TARGETS ${PNG_LIBRARY} ARCHIVE DESTINATION ${OPENCV_3P_LIB_INSTALL_PATH} COMPONENT main)
endif()