X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fdeps-check.cmake;h=371d8ea140b6964fe4dade33b55ba34df44d1f89;hb=8f10933048de2edce9a422ca9bfdcfbabf16a87c;hp=b60bd0cdf70c5ffbec551a24f216a1f1fefb4fd4;hpb=cd63467ebc1331b00224d1bba1803fbb80be312d;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/build/tizen/deps-check.cmake b/build/tizen/deps-check.cmake
index b60bd0c..371d8ea 100644
--- a/build/tizen/deps-check.cmake
+++ b/build/tizen/deps-check.cmake
@@ -18,9 +18,6 @@ ARG_ENABLE( ENABLE_PROFILE enable_profile "${ENABLE_VAL};UBUNTU" "Select the var
 # Tizen Major version
 ARG_ENABLE( ENABLE_TIZEN_MAJOR_VERSION enable_tizen_major_version "${ENABLE_VAL};0" "Specify the Tizen Major version for backwards compatibility" )
 
-# Tizen Minor version
-ARG_ENABLE( ENABLE_TIZEN_MINOR_VERSION enable_tizen_minor_version "${ENABLE_VAL};0" "Specify the Tizen Minor version for backwards compatibility" )
-
 ARG_ENABLE( ENABLE_FEEDBACK enable_feedback 1 "Enable feedback plugin" )
 
 ARG_ENABLE( ENABLE_WAYLAND enable_wayland "${ENABLE_VAL}" "Build on Wayland" )
@@ -69,6 +66,8 @@ CHECK_MODULE_AND_SET( FREETYPE freetype2>=${FREETYPE_REQUIRED} freetype_availabl
 CHECK_MODULE_AND_SET( FREETYPE_BITMAP_SUPPORT freetype2>=${FREETYPE_BITMAP_SUPPORT_VERSION} freetype_bitmap_support)
 CHECK_MODULE_AND_SET( FONTCONFIG fontconfig fontconfig_available )
 CHECK_MODULE_AND_SET( PNG libpng [] )
+CHECK_MODULE_AND_SET( WEBP libwebp webp_available )
+CHECK_MODULE_AND_SET( WEBP_DEMUX libwebpdemux [] )
 CHECK_MODULE_AND_SET( LIBEXIF libexif [] )
 CHECK_MODULE_AND_SET( LIBDRM libdrm [] )
 CHECK_MODULE_AND_SET( LIBCURL libcurl [] )
@@ -92,6 +91,7 @@ CHECK_MODULE_AND_SET( CAPI_SYSTEM_INFO capi-system-info [] )
 CHECK_MODULE_AND_SET( CAPI_SYSTEM_SENSOR capi-system-sensor capi_system_sensor_support )
 CHECK_MODULE_AND_SET( CAPI_SYSTEM_SYSTEM_SETTINGS capi-system-system-settings [] )
 CHECK_MODULE_AND_SET( CAPI_APPFW_APPLICATION capi-appfw-application [] )
+CHECK_MODULE_AND_SET( COMPONENT_BASED_CORE_BASE component-based-core-base [] )
 
 CHECK_MODULE_AND_SET( ELEMENTARY elementary [] )
 CHECK_MODULE_AND_SET( BUNDLE bundle [] )
@@ -104,7 +104,7 @@ CHECK_MODULE_AND_SET( CAPI_APPFW_WIDGET_BASE appcore-widget-base [] )
 CHECK_MODULE_AND_SET( CAPI_APPFW_COMMON capi-appfw-app-common [] )
 CHECK_MODULE_AND_SET( CAPI_APPFW_CONTROL capi-appfw-app-control [] )
 
-CHECK_MODULE_AND_SET( DALICORE dali-core [] )
+CHECK_MODULE_AND_SET( DALICORE dali2-core [] )
 
 IF( ANDROID_PROFILE )
   INCLUDE_DIRECTORIES( ${ANDROID_NDK} )
@@ -129,13 +129,6 @@ ENDIF()
 
 CHECK_MODULE_AND_SET( WAYLAND_EXTENSION xdg-shell-client text-client input-method-client [] )
 
-IF( enable_tizen_major_version GREATER 5 )
-  IF( enable_tizen_minor_version GREATER 5 )
-    CHECK_MODULE_AND_SET( AUTOFILL capi-ui-autofill [] )
-    ADD_DEFINITIONS( -DCAPI_AUTOFILL_SUPPORT )
-  ENDIF()
-ENDIF()
-
 # BUILD CONDITIONS
 IF( watch_available AND WEARABLE_PROFILE )
   ADD_DEFINITIONS( -DAPPCORE_WATCH_AVAILABLE )
@@ -146,6 +139,11 @@ IF( eldbus_available )
   ADD_DEFINITIONS( -DDALI_ELDBUS_AVAILABLE )
 ENDIF()
 
+IF( webp_available )
+  SET(DALI_WEBP_AVAILABLE 1)
+  ADD_DEFINITIONS( -DDALI_WEBP_AVAILABLE )
+ENDIF()
+
 ADD_DEFINITIONS( -DPLATFORM_TIZEN )
 
 IF( enable_debug )
@@ -221,13 +219,18 @@ ELSE()
   SET( cachePath /home/owner )
 ENDIF()
 
+IF( enable_appfw )
+  ADD_DEFINITIONS( -DUSE_APPFW -DCOMPONENT_APPLICATION_SUPPORT)
+ENDIF()
+
 #######################################################
 
 ADD_DEFINITIONS( -DDALI_PROFILE_${enable_profile})
 SET( DALI_PROFILE_CFLAGS -DDALI_PROFILE_${enable_profile} )
 
 # Platforms with highp shader support can use vector based text
-CONDITIONAL( ENABLE_VECTOR_BASED_TEXT_RENDERING UBUNTU_PROFILE )
+ADD_DEFINITIONS( "-DENABLE_VECTOR_BASED_TEXT_RENDERING" )
+
 CONDITIONAL( WAYLAND enable_wayland )
 
 # set lowercase profile name
@@ -244,6 +247,8 @@ SET( DALI_CFLAGS
   ${FONTCONFIG_CFLAGS}
   ${CAIRO_CFLAGS}
   ${PNG_CFLAGS}
+  ${WEBP_CFLAGS}
+  ${WEBP_DEMUX_CFLAGS}
   ${DLOG_CFLAGS}
   ${VCONF_CFLAGS}
   ${EXIF_CFLAGS}
@@ -265,6 +270,8 @@ SET( DALI_LDFLAGS
   ${FONTCONFIG_LDFLAGS}
   ${CAIRO_LDFLAGS}
   ${PNG_LDFLAGS}
+  ${WEBP_LDFLAGS}
+  ${WEBP_DEMUX_LDFLAGS}
   ${DLOG_LDFLAGS}
   ${VCONF_LDFLAGS}
   ${EXIF_LDFLAGS}
@@ -275,8 +282,6 @@ SET( DALI_LDFLAGS
   ${LIBCURL_LDFLAGS}
   ${LIBCRYPTO_LDFLAGS}
   ${HARFBUZZ_LDFLAGS}
-  ${AUTOFILL_LDFLAGS}
-  ${TPKP_CURL_LDFLAGS}
   ${UTILX_LDFLAGS}
   -lgif
   -lturbojpeg
@@ -342,6 +347,7 @@ IF( enable_appfw )
     ${CAPI_APPFW_WIDGET_BASE_CFLAGS}
     ${ECORE_IMF_CFLAGS}
     ${FRIBIDI_CFLAGS}
+    ${COMPONENT_BASED_CORE_BASE_CFLAGS}
   )
 
   SET( DALI_LDFLAGS ${DALI_LDFLAGS}
@@ -356,6 +362,7 @@ IF( enable_appfw )
     ${CAPI_APPFW_WIDGET_BASE_LDFLAGS}
     ${ECORE_IMF_LDFLAGS}
     ${FRIBIDI_LDFLAGS}
+    ${COMPONENT_BASED_CORE_BASE_LDFLAGS}
   )
 ELSE()
   SET( DALI_CFLAGS ${DALI_CFLAGS}