diff options
author | Minje Ahn <minje.ahn@samsung.com> | 2015-08-07 09:40:46 +0900 |
---|---|---|
committer | Minje Ahn <minje.ahn@samsung.com> | 2015-08-07 10:10:15 +0900 |
commit | 7adbb6954d7f05fd02b9cded3741ce6ed2c9226b (patch) | |
tree | 5315a9e75f2283f559b18a8375f093b6eca10a3e /CMakeLists.txt | |
parent | 41f405edc8f31d877615c580ed6eb308d7eaebec (diff) | |
download | libmedia-thumbnail-7adbb6954d7f05fd02b9cded3741ce6ed2c9226b.tar.gz libmedia-thumbnail-7adbb6954d7f05fd02b9cded3741ce6ed2c9226b.tar.bz2 libmedia-thumbnail-7adbb6954d7f05fd02b9cded3741ce6ed2c9226b.zip |
Patch below:submit/tizen/20150807.043057accepted/tizen/wearable/20150807.073442accepted/tizen/tv/20150807.073433accepted/tizen/mobile/20150807.073414
Separate CMakeFiles for apply fPIE option
Remove unused code
Remove thumb_type
Modify jpeg thumbnail creation logic when exif thumbnail is smaller than request thumbnail size
Add scale down logic when request huge size image
Fix bugs, memory leaks
Remove unused parameters in function
Change thumb path creation API position
Remove thumbnail folder creation API
Rename some functions
Change-Id: I0e13d393dd524b61bcf44722c33b6f270649b732
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3563418..b871878 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,31 +7,28 @@ SET(MEDIATHUMB-LIB "media-thumbnail") SET(MEDIAHASH-LIB "media-hash") SET(SRCS src/media-thumbnail.c - src/media-thumb-internal.c src/util/media-thumb-debug.c src/util/media-thumb-util.c - src/util/media-thumb-db.c + src/ipc/media-thumb-ipc.c src/codec/IfegDecodeAGIF.c src/codec/img-codec.c src/codec/img-codec-osal.c src/codec/img-codec-parser.c - src/ipc/media-thumb-ipc.c ) SET(HASH_SRCS md5/md5.c md5/media-thumb-hash.c ) -SET(THUMB-SERVER server/thumb-server.c server/thumb-server-internal.c) -SET(TEST-THUMB test/test-thumb.c) - SET(VENDOR "samsung") SET(PACKAGE ${PROJECT_NAME}) SET(PKGNAME "com.${VENDOR}.${PACKAGE}") SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(BINDIR "${PREFIX}/bin") +SET(LOCALBINDIR "${PREFIX}/local/bin") SET(DATADIR "${PREFIX}/share") SET(EXEC_PREFIX "\${prefix}") +SET(LIBDIR "\${prefix}/lib") SET(INCLUDEDIR "\${prefix}/include") IF("${CMAKE_BUILD_TYPE}" STREQUAL "") @@ -42,7 +39,7 @@ MESSAGE("Build type: ${CMAKE_BUILD_TYPE}") INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/src/include ${CMAKE_SOURCE_DIR}/src/include/util ${CMAKE_SOURCE_DIR}/src/include/codec ${CMAKE_SOURCE_DIR}/src/include/util ${CMAKE_SOURCE_DIR}/src/include/ipc ${CMAKE_SOURCE_DIR}/server/include ${CMAKE_SOURCE_DIR}/md5) INCLUDE(FindPkgConfig) -pkg_check_modules(pkgs REQUIRED glib-2.0 gthread-2.0 dlog mm-fileinfo aul libexif ecore-evas evas mmutil-imgp mmutil-jpeg heynoti libmedia-utils vconf libtzplatform-config) + pkg_check_modules(pkgs REQUIRED glib-2.0 gthread-2.0 dlog sqlite3 mm-fileinfo aul libexif ecore-evas evas mmutil-imgp mmutil-jpeg libmedia-utils vconf libtzplatform-config) FOREACH(flag ${pkgs_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") @@ -82,15 +79,10 @@ SET_TARGET_PROPERTIES(${MEDIATHUMB-LIB} PROPERTIES VERSION ${VERSION}) INSTALL(TARGETS ${MEDIATHUMB-LIB} LIBRARY DESTINATION ${LIB_INSTALL_DIR}) INSTALL(TARGETS ${MEDIAHASH-LIB} LIBRARY DESTINATION ${LIB_INSTALL_DIR}) -ADD_EXECUTABLE(media-thumbnail-server ${THUMB-SERVER}) -TARGET_LINK_LIBRARIES(media-thumbnail-server ${pkgs_LDFLAGS} ${MEDIATHUMB-LIB} ) -INSTALL(TARGETS media-thumbnail-server DESTINATION ${BINDIR}) - -#ADD_EXECUTABLE(test-thumb ${TEST-THUMB}) -#TARGET_LINK_LIBRARIES(test-thumb ${pkgs_LDFLAGS} ${MEDIATHUMB-LIB} ) -#INSTALL(TARGETS test-thumb DESTINATION ${BINDIR}) +ADD_SUBDIRECTORY(server) +ADD_SUBDIRECTORY(test) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/media-thumbnail.h DESTINATION include/${MEDIATHUMB-LIB}) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/media-thumb-types.h DESTINATION include/${MEDIATHUMB-LIB}) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/include/codec/img-codec-parser.h DESTINATION include/${MEDIATHUMB-LIB}) #INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/thumbsvr DESTINATION /etc/init.d) |