X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fdeps-check.cmake;h=a13dc7d99f9d8c2953e3411bfbd07e48292c5dc0;hb=4b6d3354de5664bf233b002041f2317855749d5f;hp=449d8480513d4ecea669631eaa7fd4b6fc4bb150;hpb=0d4adf79c0991f674775be199b1f6be17f525ce0;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 449d848..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. @@ -127,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() @@ -169,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() @@ -369,6 +369,7 @@ IF( enable_appfw ) ${ECORE_IMF_CFLAGS} ${FRIBIDI_CFLAGS} ${COMPONENT_BASED_CORE_BASE_CFLAGS} + ${SCREENCONNECTORPROVIDER_CFLAGS} ) SET( DALI_LDFLAGS ${DALI_LDFLAGS} @@ -384,6 +385,7 @@ IF( enable_appfw ) ${ECORE_IMF_LDFLAGS} ${FRIBIDI_LDFLAGS} ${COMPONENT_BASED_CORE_BASE_LDFLAGS} + ${SCREENCONNECTORPROVIDER_LDFLAGS} ) ELSE() SET( DALI_CFLAGS ${DALI_CFLAGS} @@ -440,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()