Title: [186050] trunk
Revision
186050
Author
commit-qu...@webkit.org
Date
2015-06-28 12:09:46 -0700 (Sun, 28 Jun 2015)

Log Message

CairoGL should be checked unconditionally
https://bugs.webkit.org/show_bug.cgi?id=146390

Patch by Philip Chimento <philip.chime...@gmail.com> on 2015-06-28
Reviewed by Darin Adler.

* Source/cmake/OptionsGTK.cmake: Move check for CairoGL so that
it is run unconditionally; this is necessary because its result
is used later on, outside of any conditions.

Modified Paths

Diff

Modified: trunk/ChangeLog (186049 => 186050)


--- trunk/ChangeLog	2015-06-28 18:53:57 UTC (rev 186049)
+++ trunk/ChangeLog	2015-06-28 19:09:46 UTC (rev 186050)
@@ -1,3 +1,14 @@
+2015-06-28  Philip Chimento  <philip.chime...@gmail.com>
+
+        CairoGL should be checked unconditionally
+        https://bugs.webkit.org/show_bug.cgi?id=146390
+
+        Reviewed by Darin Adler.
+
+        * Source/cmake/OptionsGTK.cmake: Move check for CairoGL so that
+        it is run unconditionally; this is necessary because its result
+        is used later on, outside of any conditions.
+
 2015-06-27  Carlos Garcia Campos  <cgar...@igalia.com>
 
         [GTK][SOUP] Implement WebCore::PublicSuffix for soup and enable PUBLIC_SUFFIX_LIST for GTK+

Modified: trunk/Source/cmake/OptionsGTK.cmake (186049 => 186050)


--- trunk/Source/cmake/OptionsGTK.cmake	2015-06-28 18:53:57 UTC (rev 186049)
+++ trunk/Source/cmake/OptionsGTK.cmake	2015-06-28 19:09:46 UTC (rev 186050)
@@ -116,8 +116,8 @@
     if (EGL_FOUND)
         list(APPEND CAIROGL_COMPONENTS cairo-egl)
     endif ()
-    find_package(CairoGL 1.10.2 COMPONENTS ${CAIROGL_COMPONENTS})
 endif ()
+find_package(CairoGL 1.10.2 COMPONENTS ${CAIROGL_COMPONENTS})
 
 # Normally we do not set the value of options automatically. However, CairoGL is special. Currently
 # most major distros compile Cario with --enable-gl, but Debian and derivitives are a major
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to