Changeset 95379 in webkit

Timestamp:

Sep 17, 2011 2:28:13 AM (13 years ago)

Author:

ryuan.choi@samsung.com

Message:

[EFL] Bump minimum requirement for cairo to 1.10.
​https://bugs.webkit.org/show_bug.cgi?id=68226

Reviewed by Adam Barth.

• Source/cmake/FindCairo.cmake: Check required version.
• Source/cmake/OptionsEfl.cmake:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/FindCairo.cmake (modified) (1 diff)
• Source/cmake/OptionsEfl.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2011-09-17  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL] Bump minimum requirement for cairo to 1.10.
+        https://bugs.webkit.org/show_bug.cgi?id=68226
+
+        Reviewed by Adam Barth.
+
+        * Source/cmake/FindCairo.cmake: Check required version.
+        * Source/cmake/OptionsEfl.cmake:
+
 2011-09-16  Ulan Degenbaev  <ulan@chromium.org>
 

trunk/Source/cmake/FindCairo.cmake

@@ -12 +12 @@
 
 # Use pkg-config to get hints about paths
-libfind_pkg_check_modules(Cairo_PKGCONF cairo)
+set (Module cairo)
+if (Cairo_FIND_VERSION)
+  set (Module "${Module}>=${Cairo_FIND_VERSION}")
+endif ()
+
+libfind_pkg_check_modules(Cairo_PKGCONF ${Module})
 
 # Include dir

trunk/Source/cmake/OptionsEfl.cmake

@@ -27 +27 @@
 SET(FONT_BACKEND "freetype" CACHE STRING "choose which network backend to use (one of ${ALL_FONT_BACKENDS})")
 
-FIND_PACKAGE(Cairo 1.6 REQUIRED)
+FIND_PACKAGE(Cairo 1.10 REQUIRED)
 FIND_PACKAGE(EFL REQUIRED)
 FIND_PACKAGE(Fontconfig 2.8.0 REQUIRED)