X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fdeps-check.cmake;h=a13dc7d99f9d8c2953e3411bfbd07e48292c5dc0;hb=4b6d3354de5664bf233b002041f2317855749d5f;hp=924db40573e30248e8788789fbc123ba029c2a30;hpb=9e3545baf5bb3e4ef01de1b63756d98e81c68b97;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/build/tizen/deps-check.cmake b/build/tizen/deps-check.cmake
old mode 100644
new mode 100755
index 924db40..a13dc7d
--- a/build/tizen/deps-check.cmake
+++ b/build/tizen/deps-check.cmake
@@ -5,7 +5,7 @@ INCLUDE( common.cmake )
 ARG_ENABLE( ENABLE_EXPORTALL enable_exportall 1 "Enables the exporting of all the symbols in the library" )
 ARG_ENABLE( ENABLE_DEBUG enable_debug ${ENABLE_VAL} "Turns on debugging" )
 ARG_ENABLE( ENABLE_SHADERBINCACHE enable_shaderbincache ${ENABLE_VAL} "Enables shader binary cache" )
-ARG_ENABLE( ENABLE_NETWORKLOGGING enable_networklogging ${ENABLE_VAL} "Enables network for debug tool" )
+ARG_ENABLE( ENABLE_NETWORK_LOGGING enable_network_logging ${ENABLE_VAL} "Enables network for debug tool" )
 
 # Currently, dali-adaptor requires appfw on Tizen
 # and does not require it on Ubuntu.
@@ -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" )
@@ -77,6 +74,7 @@ CHECK_MODULE_AND_SET( LIBEXIF libexif [] )
 CHECK_MODULE_AND_SET( LIBDRM libdrm [] )
 CHECK_MODULE_AND_SET( LIBCURL libcurl [] )
 CHECK_MODULE_AND_SET( HARFBUZZ harfbuzz [] )
+CHECK_MODULE_AND_SET( HYPHEN libhyphen [] )
 CHECK_MODULE_AND_SET( FRIBIDI fribidi [] )
 CHECK_MODULE_AND_SET( CAIRO cairo [] )
 CHECK_MODULE_AND_SET( EVAS evas [] )
@@ -129,7 +127,7 @@ ENDIF()
 
 IF( enable_wayland )
   IF( enable_ecore_wayland2 )
-    PKG_CHECK_MODULES(WAYLAND ecore-wl2 egl wayland-egl wayland-egl-tizen wayland-client>=1.2.0 xkbcommon libtbm )
+    PKG_CHECK_MODULES(WAYLAND ecore-wl2 egl wayland-egl wayland-egl-tizen wayland-client>=1.2.0 input-method-client xkbcommon libtbm )
   ELSE()
     PKG_CHECK_MODULES(WAYLAND ecore-wayland egl wayland-egl wayland-client>=1.2.0 xkbcommon libtbm)
   ENDIF()
@@ -141,13 +139,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 )
@@ -178,7 +169,7 @@ IF( enable_shaderbincache )
   ADD_DEFINITIONS( -DSHADERBIN_CACHE_ENABLED )
 ENDIF()
 
-IF( enable_networklogging )
+IF( enable_network_logging )
   ADD_DEFINITIONS( -DNETWORK_LOGGING_ENABLED )
 ENDIF()
 
@@ -305,12 +296,17 @@ IF (NOT APPLE)
     ${LIBCRYPTO_LDFLAGS}
     ${HARFBUZZ_LDFLAGS}
     ${UTILX_LDFLAGS}
-    ${AUTOFILL_LDFLAGS}
-    ${TPKP_CURL_LDFLAGS}
     -lgif
     -lturbojpeg
     -ljpeg
   )
+
+if( NOT ANDROID_PROFILE )
+  SET( DALI_LDFLAGS ${DALI_LDFLAGS}
+    -lhyphen
+  )
+ENDIF()
+
 ENDIF()
 
 # Android includes pthread with android lib
@@ -373,6 +369,7 @@ IF( enable_appfw )
     ${ECORE_IMF_CFLAGS}
     ${FRIBIDI_CFLAGS}
     ${COMPONENT_BASED_CORE_BASE_CFLAGS}
+    ${SCREENCONNECTORPROVIDER_CFLAGS}
   )
 
   SET( DALI_LDFLAGS ${DALI_LDFLAGS}
@@ -388,6 +385,7 @@ IF( enable_appfw )
     ${ECORE_IMF_LDFLAGS}
     ${FRIBIDI_LDFLAGS}
     ${COMPONENT_BASED_CORE_BASE_LDFLAGS}
+    ${SCREENCONNECTORPROVIDER_LDFLAGS}
   )
 ELSE()
   SET( DALI_CFLAGS ${DALI_CFLAGS}
@@ -444,11 +442,9 @@ IF( WEARABLE_PROFILE )
   SET( DALI_CFLAGS ${DALI_CFLAGS}
     ${HAPTIC_CFLAGS}
     ${EFL_ASSIST_CFLAGS}
-    ${SCREENCONNECTORPROVIDER_CFLAGS}
     ${APPCORE_WATCH_CFLAGS}
   )
   SET( DALI_LDFLAGS ${DALI_LDFLAGS}
-    ${SCREENCONNECTORPROVIDER_LDFLAGS}
     ${APPCORE_WATCH_LDFLAGS}
   )
 ENDIF()