Title: [188685] trunk
- Revision
- 188685
- Author
- g...@gnome.org
- Date
- 2015-08-20 06:55:06 -0700 (Thu, 20 Aug 2015)
Log Message
[GTK] Auto-detection of cairo-gl fails
https://bugs.webkit.org/show_bug.cgi?id=148189
Patch by Gustavo Noronha Silva <gustavo.noro...@collabora.co.uk> on 2015-08-20
Reviewed by Žan Doberšek.
* Source/cmake/FindCairoGL.cmake: only check for components if the main package has
been found. Otherwise, if either GLX or EGL are available, cairo-gl will also be
deemed available, which might not be the case.
* Source/cmake/OptionsGTK.cmake: fix the usage of the CAIROGL_FOUND variable.
Modified Paths
Diff
Modified: trunk/ChangeLog (188684 => 188685)
--- trunk/ChangeLog 2015-08-20 08:00:43 UTC (rev 188684)
+++ trunk/ChangeLog 2015-08-20 13:55:06 UTC (rev 188685)
@@ -1,3 +1,15 @@
+2015-08-20 Gustavo Noronha Silva <gustavo.noro...@collabora.co.uk>
+
+ [GTK] Auto-detection of cairo-gl fails
+ https://bugs.webkit.org/show_bug.cgi?id=148189
+
+ Reviewed by Žan Doberšek.
+
+ * Source/cmake/FindCairoGL.cmake: only check for components if the main package has
+ been found. Otherwise, if either GLX or EGL are available, cairo-gl will also be
+ deemed available, which might not be the case.
+ * Source/cmake/OptionsGTK.cmake: fix the usage of the CAIROGL_FOUND variable.
+
2015-08-19 Alex Christensen <achristen...@webkit.org>
CMake Windows build should not include files directly from other Source directories
Modified: trunk/Source/cmake/FindCairoGL.cmake (188684 => 188685)
--- trunk/Source/cmake/FindCairoGL.cmake 2015-08-20 08:00:43 UTC (rev 188684)
+++ trunk/Source/cmake/FindCairoGL.cmake 2015-08-20 13:55:06 UTC (rev 188685)
@@ -31,6 +31,7 @@
find_package(PkgConfig)
pkg_check_modules(CAIROGL cairo-gl)
+if (CAIROGL_FOUND)
# At the moment CairoGL does not add any extra cflags and libraries, so we can
# safely ignore CAIROGL_LIBRARIES and CAIROGL_INCLUDE_DIRS for the moment.
foreach (_component ${CairoGL_FIND_COMPONENTS})
@@ -47,4 +48,4 @@
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(CairoGL DEFAULT_MSG CAIROGL_INCLUDE_DIRS CAIROGL_LIBRARIES)
-
+endif ()
Modified: trunk/Source/cmake/OptionsGTK.cmake (188684 => 188685)
--- trunk/Source/cmake/OptionsGTK.cmake 2015-08-20 08:00:43 UTC (rev 188684)
+++ trunk/Source/cmake/OptionsGTK.cmake 2015-08-20 13:55:06 UTC (rev 188685)
@@ -128,7 +128,7 @@
# EGL is not, and ENABLE_X11_TARGET is OFF, this guess is wrong and the user must override it. We
# can't check ENABLE_X11_TARGET at this point because we don't know whether it's enabled until
# WEBKIT_OPTION_END has been called, and at that point it's too late to change default values.
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC ${CAIROGL_FOUND})
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC CAIROGL_FOUND)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CREDENTIAL_STORAGE PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT PUBLIC ON)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
