diff options
| author | Kwang Son <k.son@samsung.com> | 2020-05-14 16:44:40 +0900 |
|---|---|---|
| committer | Kwang Son <k.son@samsung.com> | 2020-05-15 08:20:31 +0900 |
| commit | a41d9ba10291ff359abc3037d00a24157b627207 (patch) | |
| tree | 259a4b36cd4fc586d5319e1de73bca4a795fc736 /CMakeLists.txt | |
| parent | 2dd0e29b093e597bf7d899ff9f5f16f01276335e (diff) | |
| download | mediavision-a41d9ba10291ff359abc3037d00a24157b627207.tar.gz mediavision-a41d9ba10291ff359abc3037d00a24157b627207.tar.bz2 mediavision-a41d9ba10291ff359abc3037d00a24157b627207.zip | |
Delete capi-media-vision.sosubmit/tizen/20200528.003104submit/tizen/20200525.012135submit/tizen/20200518.045832submit/tizen/20200515.042825
- remove duplicate sources
- change capi-media-vision.rpm to meta pacakge
Problem
capi-media-vision.so is contain duplicate libraries from
sub-packages like libmv_common, libmv_face. So each files
are already included own libraries.
e.g. src/mv_common.c, mv_common/src/mv_common.c are exactly same code.
Change-Id: Id0095e4e64cbafb964d471efd285f2f32ec73711
Signed-off-by: Kwang Son <k.son@samsung.com>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b7fcd3fb..081aee20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,3 @@ - CMAKE_MINIMUM_REQUIRED(VERSION 2.6) SET(fw_name "capi-media-vision") @@ -155,26 +154,6 @@ ADD_SUBDIRECTORY(mv_face) ADD_SUBDIRECTORY(mv_surveillance) ADD_SUBDIRECTORY(mv_inference) -aux_source_directory(src SOURCES) -ADD_LIBRARY(${fw_name} SHARED ${SOURCES}) - -TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS} - ${MV_COMMON_LIB_NAME} - ${MV_BARCODE_DETECTOR_LIB_NAME} - ${MV_BARCODE_GENERATOR_LIB_NAME} - ${MV_IMAGE_LIB_NAME} - ${MV_FACE_LIB_NAME} - ${MV_SURVEILLANCE_LIB_NAME} - ${MV_INFERENCE_LIB_NAME}) - -SET_TARGET_PROPERTIES(${fw_name} - PROPERTIES - VERSION ${FULLVER} - SOVERSION ${MAJORVER} - CLEAN_DIRECT_OUTPUT 1 -) - -INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR}) INSTALL( DIRECTORY ${INC_DIR}/ DESTINATION include/media FILES_MATCHING @@ -183,8 +162,9 @@ INSTALL( ) SET(PC_NAME ${fw_name}) -SET(PC_REQUIRED ${pc_dependents}) -SET(PC_LDFLAGS -l${fw_name}) +SET(PC_REQUIRED "${fw_name}-barcode ${fw_name}-face ${fw_name}-image ${fw_name}-surveillance ${fw_name}-inference") +SET(PC_LDFLAGS "-l${MV_COMMON_LIB_NAME} -l${MV_BARCODE_DETECTOR_LIB_NAME} -l${MV_BARCODE_GENERATOR_LIB_NAME} \ +-l${MV_IMAGE_LIB_NAME} -l${MV_FACE_LIB_NAME} -l${MV_SURVEILLANCE_LIB_NAME} -l${MV_INFERENCE_LIB_NAME}") SET(PC_CFLAGS -I\${includedir}/media) CONFIGURE_FILE( @@ -195,6 +175,7 @@ CONFIGURE_FILE( INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) SET(PC_NAME ${fw_name}-common) +SET(PC_REQUIRED ${pc_dependents}) SET(PC_LDFLAGS "-l${MV_COMMON_LIB_NAME}") CONFIGURE_FILE( ${fw_name}.pc.in |