Title: [106098] trunk
- Revision
- 106098
- Author
- commit-qu...@webkit.org
- Date
- 2012-01-27 00:03:54 -0800 (Fri, 27 Jan 2012)
Log Message
[EFL] SVG_FONT is not disabled when SVG is disabled.
https://bugs.webkit.org/show_bug.cgi?id=77174
Patch by ChangSeok Oh <shivami...@gmail.com> on 2012-01-27
Reviewed by Eric Seidel.
SVG_FONTS should be disabled when SVG is disabled. Or else it causes build-break.
Relocated checking ENABLE_GLIB_SUPPORT & ENABLE_VIDEO to avoid duplication.
* Source/cmake/OptionsEfl.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (106097 => 106098)
--- trunk/ChangeLog 2012-01-27 07:52:38 UTC (rev 106097)
+++ trunk/ChangeLog 2012-01-27 08:03:54 UTC (rev 106098)
@@ -1,3 +1,15 @@
+2012-01-27 ChangSeok Oh <shivami...@gmail.com>
+
+ [EFL] SVG_FONT is not disabled when SVG is disabled.
+ https://bugs.webkit.org/show_bug.cgi?id=77174
+
+ Reviewed by Eric Seidel.
+
+ SVG_FONTS should be disabled when SVG is disabled. Or else it causes build-break.
+ Relocated checking ENABLE_GLIB_SUPPORT & ENABLE_VIDEO to avoid duplication.
+
+ * Source/cmake/OptionsEfl.cmake:
+
2012-01-26 Kevin Ollivier <kev...@theolliviers.com>
[wx] Unreviewed. Build fix, don't build some sources
Modified: trunk/Source/cmake/OptionsEfl.cmake (106097 => 106098)
--- trunk/Source/cmake/OptionsEfl.cmake 2012-01-27 07:52:38 UTC (rev 106097)
+++ trunk/Source/cmake/OptionsEfl.cmake 2012-01-27 08:03:54 UTC (rev 106098)
@@ -139,17 +139,14 @@
ENDIF ()
ENDIF ()
+IF (NOT ENABLE_SVG)
+ SET(ENABLE_SVG_FONTS 0)
+ENDIF ()
+
IF (ENABLE_VIDEO)
SET(ENABLE_GLIB_SUPPORT 1)
MESSAGE("Forcing Glib support")
-ENDIF()
-IF (ENABLE_GLIB_SUPPORT)
- FIND_PACKAGE(Glib REQUIRED)
- FIND_PACKAGE(Gthread REQUIRED)
-ENDIF ()
-
-IF (ENABLE_VIDEO)
FIND_PACKAGE(GStreamer REQUIRED)
FIND_PACKAGE(GStreamer-App REQUIRED)
FIND_PACKAGE(GStreamer-Base REQUIRED)
@@ -161,6 +158,11 @@
ADD_DEFINITIONS(-DWTF_USE_GSTREAMER=1)
ENDIF()
+IF (ENABLE_GLIB_SUPPORT)
+ FIND_PACKAGE(Glib REQUIRED)
+ FIND_PACKAGE(Gthread REQUIRED)
+ENDIF ()
+
IF (ENABLE_WEBGL)
FIND_PACKAGE(OpenGL REQUIRED)
ENDIF ()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
