Merge "add indicator area at setas, crop view" into tizen_2.0

[apps/core/preloaded/ug-image-viewer-efl.git] / main / CMakeLists.txt

diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index 252c54c..d0c71af 100755 (executable)
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -11,13 +11,15 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 
 SET(SRCS
 # Entry point
-       src/ug-image-viewer.c
+       src/ug-image-viewer.cpp
 
 # View related
        src/view/ivug-main-view.cpp
        src/view/ivug-main-view-toolbar.cpp
        src/view/ivug-main-view-menu.cpp
 
+       src/view/ivug-slideshow-view.cpp
+
        src/view/ivug-name-view.c
        src/view/ivug-details-view.c
        src/view/ivug-crop-view.cpp
@@ -35,7 +37,6 @@ SET(SRCS
 # Control related
        src/control/ivug-parameter.c
        src/control/ivug-context.c
-       src/control/ivug-filter.c
        src/control/ivug-detail-info.c
        src/control/ivug-setas.cpp
        src/control/ivug-crop-ug.cpp
@@ -51,6 +52,7 @@ INCLUDE_DIRECTORIES(
        ${IVUG_SOURCE_WIDGET_DIR}/include
        ${IVUG_SOURCE_COMMON_DIR}/include
        ${IVUG_SOURCE_MEDIA_DIR}/include
+       ${IVUG_SOURCE_RESOURCE_DIR}/include
        src
        src/include
        src/control
@@ -58,11 +60,10 @@ INCLUDE_DIRECTORIES(
        ${IVUG_SOURCE_SLIDESHOW_DIR}/include
 
 # Below include directory should be removed for make module more indepentatly
-       ${IVUG_SOURCE_SLIDESHOW_DIR}/src/effect/include
+#      ${IVUG_SOURCE_SLIDESHOW_DIR}/src/effect/include
+#      ${IVUG_SOURCE_SLIDESHOW_DIR}/src/dali_effect/include
 )
 
-MESSAGE("Checking " ${PROJECT_NAME}\r)
-
 INCLUDE(FindPkgConfig)
 pkg_check_modules(pkgs REQUIRED
        elementary
@@ -78,38 +79,19 @@ pkg_check_modules(pkgs REQUIRED
        ecore-evas
        utilX
        ui-gadget-1
+       libmedia-utils
+       media-thumbnail
        drm-client
-       icu-i18n
        glib-2.0
        vconf
        capi-appfw-application
        capi-appfw-app-manager
-       capi-system-runtime-info
 )
 
-
 FOREACH(flag ${pkgs_CFLAGS})
-       SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
+       SET(EXTRA_FLAGS "${EXTRA_FLAGS} ${flag}")
 ENDFOREACH(flag)
 
-#if("${CMAKE_SYSTEM_VERSION}" STREQUAL "arm")
-#      pkg_check_modules(armpkgs REQUIRED
-#      )
-#
-#      FOREACH(flag ${armpkgs_CFLAGS})
-#              SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-#      ENDFOREACH(flag)
-#
-#endif()
-
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
-SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
-
-message("CFLAGS="${CMAKE_C_FLAGS})
-message("CXXFLAGS="${CMAKE_CXX_FLAGS})
-message("LDFLAGS="${LDFLAGS})
-message("LDFLAGS1="${pkgs_LDFLAGS})
-
 ADD_DEFINITIONS("-DUG_MODULE_API=__attribute__ \(\(visibility\(\"default\"\)\)\)")
 ADD_DEFINITIONS("-DPACKAGE=\"${PROJECT_NAME}\"")
 
@@ -117,6 +99,7 @@ ADD_DEFINITIONS("-DPACKAGE=\"${PROJECT_NAME}\"")
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION})
+SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS ${EXTRA_FLAGS})
 
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
 
@@ -146,6 +129,7 @@ BUILD_EDJ(ivug-gengrid.edc                  ivug-gengrid.edj                layout          gengrid)
 BUILD_EDJ(ivug-setas.edc                       ivug-setas.edj                  layout          ${THEME_FOLDER}/${THEME})
 BUILD_EDJ(ivug-naviframe.edc           ivug-naviframe.edj              layout          ${THEME_FOLDER}/${THEME})
 BUILD_EDJ(ivug-name-view.edc           ivug-name-view.edj              layout          ${THEME_FOLDER}/${THEME})
+BUILD_EDJ(ivug-slideshow-view.edc      ivug-slideshow-view.edj layout          ${THEME_FOLDER}/${THEME})
 BUILD_EDJ(ivug-genlist.edc                     ivug-genlist.edj                layout/genlist  ../${THEME_FOLDER}/${THEME})
 
 
@@ -155,7 +139,5 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/res/images/ DESTINATION ${CMAKE_IN
 #
 INSTALL(DIRECTORY DESTINATION ${CMAKE_DATA_DIR}/${PROJECT_NAME})
 
-# i18n
-ADD_SUBDIRECTORY(res/po)