Merge "(Mac OSX Build) Use vcpkg cairo" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 6 Jan 2021 15:23:35 +0000 (15:23 +0000)
committerGerrit Code Review <gerrit@review>
Wed, 6 Jan 2021 15:23:35 +0000 (15:23 +0000)
build/tizen/.gitignore
build/tizen/profiles/macos-profile.cmake

index 8469aaf..1ab58fe 100644 (file)
@@ -12,3 +12,5 @@ doc
 install_manifest.txt
 libdali2-adaptor.so.*
 linker-test
+*config.cmake
+*.dylib
index 51aa89b..6430fca 100644 (file)
@@ -75,6 +75,7 @@ FIND_PACKAGE( harfbuzz REQUIRED )
 FIND_LIBRARY( FRIBIDI_LIBRARY NAMES fribidi REQUIRED )
 
 FIND_PACKAGE( unofficial-angle REQUIRED )
+FIND_PACKAGE( unofficial-cairo REQUIRED )
 FIND_PACKAGE( dali2-core REQUIRED)
 
 FIND_PACKAGE( WebP REQUIRED )
@@ -102,9 +103,8 @@ SET(REQUIRED_LIBS
   harfbuzz::harfbuzz
   ${FRIBIDI_LIBRARY}
   unofficial::angle::libEGL
-  unofficial::angle::libANGLE
   unofficial::angle::libGLESv2
-  unofficial::angle::angle_common
+  unofficial::cairo::cairo
   WebP::webp
   WebP::webpdemux
   dali2-core::dali2-core