X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2Fdeps-check.cmake;h=449d8480513d4ecea669631eaa7fd4b6fc4bb150;hb=6e2cd9b8b520c5522756bc7ebc9ef84602884af0;hp=cce30bf1ba8ec566bc7ee17c2b5a68682dc61657;hpb=350a418d238297707eec97529b52af504c555490;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/build/tizen/deps-check.cmake b/build/tizen/deps-check.cmake
index cce30bf..449d848 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" )
@@ -45,7 +42,7 @@ IF( NOT enable_profile )
 ENDIF()
 
 # Test for profile and exit if something wrong
-SET( VALID_PROFILES COMMON MOBILE WEARABLE TV IVI UBUNTU ANDROID WINDOWS )
+SET( VALID_PROFILES COMMON MOBILE WEARABLE TV IVI UBUNTU ANDROID WINDOWS MACOS )
 LIST( FIND VALID_PROFILES ${enable_profile} RESULT )
 IF( RESULT EQUAL -1 )
   MESSAGE( FATAL_ERROR "Invalid profile!" )
@@ -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 [] )
@@ -112,13 +110,19 @@ CHECK_MODULE_AND_SET( CAPI_APPFW_CONTROL capi-appfw-app-control [] )
 
 CHECK_MODULE_AND_SET( DALICORE dali2-core [] )
 
+CHECK_MODULE_AND_SET( THORVG thorvg thorvg_support )
+
+IF( thorvg_support )
+  ADD_DEFINITIONS( -DTHORVG_SUPPORT )
+ENDIF()
+
 IF( ANDROID_PROFILE )
   INCLUDE_DIRECTORIES( ${ANDROID_NDK} )
   INCLUDE_DIRECTORIES( ${ANDROID_NDK}/sources )
   INCLUDE_DIRECTORIES( ${ANDROID_NDK}/sources/android )
   INCLUDE_DIRECTORIES( ${ANDROID_NDK}/sources/android/native_app_glue )
-  INCLUDE_DIRECTORIES( ${ANDROID_NDK}/sysroot/usr )
-  INCLUDE_DIRECTORIES( ${ANDROID_NDK}/sysroot/usr/include/android )
+  INCLUDE_DIRECTORIES( ${CMAKE_SYSROOT}/usr )
+  INCLUDE_DIRECTORIES( ${CMAKE_SYSROOT}/usr/include/android )
 ENDIF()
 
 IF( enable_wayland )
@@ -135,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 )
@@ -226,7 +223,7 @@ IF( DEFINED ENV{FONT_CONFIGURATION_FILE} )
   SET( fontConfigurationFile $ENV{FONT_CONFIGURATION_FILE} )
 ENDIF()
 
-IF( UBUNTU_PROFILE )
+IF( UBUNTU_PROFILE OR MACOS_PROFILE )
   SET( cachePath $ENV{HOME} )
 ELSE()
   SET( cachePath /home/owner )
@@ -259,6 +256,7 @@ SET( DALI_CFLAGS
   ${FREETYPE_CFLAGS}
   ${FONTCONFIG_CFLAGS}
   ${CAIRO_CFLAGS}
+  ${THORVG_CFLAGS}
   ${PNG_CFLAGS}
   ${WEBP_CFLAGS}
   ${WEBP_DEMUX_CFLAGS}
@@ -275,33 +273,41 @@ SET( DALI_CFLAGS
   -Wall
 )
 
-# Default set of linked librarires
-SET( DALI_LDFLAGS
-  ${DALICORE_LDFLAGS}
-  ${OPENGLES20_LDFLAGS}
-  ${FREETYPE_LDFLAGS}
-  ${FONTCONFIG_LDFLAGS}
-  ${CAIRO_LDFLAGS}
-  ${PNG_LDFLAGS}
-  ${WEBP_LDFLAGS}
-  ${WEBP_DEMUX_LDFLAGS}
-  ${DLOG_LDFLAGS}
-  ${VCONF_LDFLAGS}
-  ${EXIF_LDFLAGS}
-  ${TTS_LDFLAGS}
-  ${CAPI_SYSTEM_SENSOR_LDFLAGS}
-  ${LIBDRM_LDFLAGS}
-  ${LIBEXIF_LDFLAGS}
-  ${LIBCURL_LDFLAGS}
-  ${LIBCRYPTO_LDFLAGS}
-  ${HARFBUZZ_LDFLAGS}
-  ${AUTOFILL_LDFLAGS}
-  ${TPKP_CURL_LDFLAGS}
-  ${UTILX_LDFLAGS}
-  -lgif
-  -lturbojpeg
-  -ljpeg
-)
+IF (NOT APPLE)
+  # Default set of linked librarires
+  SET( DALI_LDFLAGS
+    ${DALICORE_LDFLAGS}
+    ${OPENGLES20_LDFLAGS}
+    ${FREETYPE_LDFLAGS}
+    ${FONTCONFIG_LDFLAGS}
+    ${CAIRO_LDFLAGS}
+    ${THORVG_LDFLAGS}
+    ${PNG_LDFLAGS}
+    ${WEBP_LDFLAGS}
+    ${WEBP_DEMUX_LDFLAGS}
+    ${DLOG_LDFLAGS}
+    ${VCONF_LDFLAGS}
+    ${EXIF_LDFLAGS}
+    ${TTS_LDFLAGS}
+    ${CAPI_SYSTEM_SENSOR_LDFLAGS}
+    ${LIBDRM_LDFLAGS}
+    ${LIBEXIF_LDFLAGS}
+    ${LIBCURL_LDFLAGS}
+    ${LIBCRYPTO_LDFLAGS}
+    ${HARFBUZZ_LDFLAGS}
+    ${UTILX_LDFLAGS}
+    -lgif
+    -lturbojpeg
+    -ljpeg
+  )
+
+if( NOT ANDROID_PROFILE )
+  SET( DALI_LDFLAGS ${DALI_LDFLAGS}
+    -lhyphen
+  )
+ENDIF()
+
+ENDIF()
 
 # Android includes pthread with android lib
 if( NOT ANDROID_PROFILE )