Update package version to 1.7.4

[platform/core/uifw/ise-default.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09e051e..0d3dae8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,7 @@ SET(ISE_SRCS
     src/ise.cpp
     src/languages.cpp
     src/ise-language-change.cpp
+    src/ise-tutorial-mode.cpp
     src/config.cpp
     src/imdata.cpp
     src/ise-stt-mode.cpp
@@ -22,6 +23,7 @@ SET(ISE_SRCS
     src/candidate/candidate.cpp
     src/candidate/efl/candidate-efl.cpp
     src/candidate/efl/candidate-multiline-efl.cpp
+    src/autofill.cpp
 
     src/ise-emoticon-list.cpp
     src/ise-emoticon-mode.cpp
@@ -39,6 +41,7 @@ SET(ISE_SETTING_SRCS
     src/eflutil.cpp
     src/languages.cpp
     src/sdk/ise_lang_table.cpp
+    src/autofill.cpp
 )
 
 SET(ISE_PACKAGE ${PROJECT_NAME})
@@ -73,7 +76,10 @@ SET(PKGS_CHECK_MODULES
         capi-appfw-preference
         capi-media-audio-io
         capi-ui-inputmethod
+        capi-system-system-settings
         smartreply
+        key-manager
+        ode
         )
 
 IF (with_cbhm)
@@ -95,11 +101,13 @@ SET(SETTING_PKGS_CHECK_MODULES
         libxml-2.0
         capi-appfw-application
         capi-appfw-preference
+        capi-system-system-settings
+        key-manager
         )
 
 pkg_check_modules(ISE_SETTING_PKGS REQUIRED ${SETTING_PKGS_CHECK_MODULES})
 
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -fPIE -Wall -fpermissive")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -fPIE -Wall -fpermissive -Werror")
 #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -finstrument-functions")
 SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
 SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -g")
@@ -184,6 +192,24 @@ ADD_DEPENDENCIES(${PROJECT_NAME} w-input-stt.edj)
 INSTALL(FILES ${CMAKE_BINARY_DIR}/res/wearable/edje/w-input-stt.edj DESTINATION
 ${ISE_RESDIR}/edje/wearable)
 
+ADD_CUSTOM_TARGET(popup_custom.edj COMMAND edje_cc
+        -id ${CMAKE_CURRENT_SOURCE_DIR}/edje/wearable/images
+        ${CMAKE_CURRENT_SOURCE_DIR}/res/wearable/edje/popup_custom.edc
+        ${CMAKE_BINARY_DIR}/res/wearable/edje/popup_custom.edj
+        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/res/wearable/edje/popup_custom.edc)
+ADD_DEPENDENCIES(${PROJECT_NAME} popup_custom.edj)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/res/wearable/edje/popup_custom.edj DESTINATION
+${ISE_RESDIR}/edje/wearable)
+
+ADD_CUSTOM_TARGET(tutorial_popup.edj COMMAND edje_cc
+        -id ${CMAKE_CURRENT_SOURCE_DIR}/edje/wearable/images
+        ${CMAKE_CURRENT_SOURCE_DIR}/res/wearable/edje/tutorial_popup.edc
+        ${CMAKE_BINARY_DIR}/res/wearable/edje/tutorial_popup.edj
+        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/res/wearable/edje/tutorial_popup.edc)
+ADD_DEPENDENCIES(${PROJECT_NAME} tutorial_popup.edj)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/res/wearable/edje/tutorial_popup.edj DESTINATION
+${ISE_RESDIR}/edje/wearable)
+
 ADD_CUSTOM_TARGET(w-input-stt-button.edj COMMAND edje_cc
         -id ${CMAKE_CURRENT_SOURCE_DIR}/edje/wearable/images
         ${CMAKE_CURRENT_SOURCE_DIR}/res/wearable/edje/w-input-stt-button.edc
@@ -222,6 +248,15 @@ ADD_DEPENDENCIES(${PROJECT_NAME} popup_custom.edj)
 INSTALL(FILES ${CMAKE_BINARY_DIR}/res/tv/edje/popup_custom.edj DESTINATION
 ${ISE_RESDIR}/edje/tv)
 
+ADD_CUSTOM_TARGET(popup_keyboard.edj COMMAND edje_cc
+        -id ${CMAKE_CURRENT_SOURCE_DIR}/edje/tv/images
+        ${CMAKE_CURRENT_SOURCE_DIR}/res/tv/edje/popup_keyboard.edc
+        ${CMAKE_BINARY_DIR}/res/tv/edje/popup_keyboard.edj
+        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/res/tv/edje/popup_keyboard.edc)
+ADD_DEPENDENCIES(${PROJECT_NAME} popup_keyboard.edj)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/res/tv/edje/popup_keyboard.edj DESTINATION
+${ISE_RESDIR}/edje/tv)
+
 else()
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/res/mobile/edje)
 ADD_CUSTOM_TARGET(w-input-stt.edj COMMAND edje_cc