merge with master

[framework/osp/image-core.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 150dc48..5abb7b6 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,15 +5,15 @@ SET (this_target osp-image-core)
 SET(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/cmake_build_tmp/output)
 
 INCLUDE_DIRECTORIES(
-  inc
-  src
-  src/inc  
-  /usr/include/chromium
-  /usr/include/ecore-1
-  /usr/include/eina-1 
-  /usr/include/eina-1/eina 
-  /usr/include/evas-1
-  /usr/include/media
+       inc
+       src
+       src/inc
+       /usr/include/chromium
+       /usr/include/ecore-1
+       /usr/include/eina-1
+       /usr/include/eina-1/eina
+       /usr/include/evas-1
+       /usr/include/media
        /usr/include/osp
        /usr/include/osp/base
        /usr/include/osp/app
@@ -38,6 +38,8 @@ SET (${this_target}_SOURCE_FILES
        src/FMedia_BmpEncoder.cpp
        src/FMedia_SlpUtil.cpp
        src/FMedia_MediaUtil.cpp
+       src/FMedia_ExifUtil.cpp
+       src/FMedia_Ffmpeg.cpp
 )
 
 ## Definitions
@@ -59,7 +61,6 @@ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined -
 TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib/osp -losp-appfw" )
 TARGET_LINK_LIBRARIES(${this_target} "-lglib-2.0" )
 TARGET_LINK_LIBRARIES(${this_target} "-leina" )
-TARGET_LINK_LIBRARIES(${this_target} "-lnetwork" )
 TARGET_LINK_LIBRARIES(${this_target} "-lcurl" )
 TARGET_LINK_LIBRARIES(${this_target} "-lpng -lz" )
 TARGET_LINK_LIBRARIES(${this_target} "-lavcodec" )
@@ -73,7 +74,7 @@ TARGET_LINK_LIBRARIES(${this_target} "-lecore_evas" )
 TARGET_LINK_LIBRARIES(${this_target} "-lcapi-media-image-util" )
 TARGET_LINK_LIBRARIES(${this_target} "-lturbojpeg" )
 TARGET_LINK_LIBRARIES(${this_target} "-ltiff" )
-       
+TARGET_LINK_LIBRARIES(${this_target} "-lexif" )
 
 SET_TARGET_PROPERTIES(${this_target} 
        PROPERTIES 
@@ -83,7 +84,7 @@ SET_TARGET_PROPERTIES(${this_target}
        )
 
 ADD_CUSTOM_COMMAND(TARGET ${this_target}
-    POST_BUILD
+       POST_BUILD
                COMMAND ${CMAKE_COMMAND} -E copy ${LIBRARY_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX} ${LIBRARY_OUTPUT_PATH}/debug/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}.${FULLVER} 
                COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}.${FULLVER} ${LIBRARY_OUTPUT_PATH}/debug/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}.${MAJORVER}
                COMMAND ${CMAKE_STRIP} --strip-unneeded ${LIBRARY_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}
@@ -93,8 +94,8 @@ ADD_CUSTOM_COMMAND(TARGET ${this_target}
 INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION lib/osp
                FILES_MATCHING PATTERN "*.so*" 
                PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ                      
-                    GROUP_EXECUTE GROUP_READ
-                    WORLD_EXECUTE WORLD_READ)
+                                       GROUP_EXECUTE GROUP_READ
+                                       WORLD_EXECUTE WORLD_READ)
 INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/debug/ DESTINATION lib/osp/debug 
                FILES_MATCHING PATTERN "*"
                PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ