Title: [187956] releases/WebKitGTK/webkit-2.8
- Revision
- 187956
- Author
- carlo...@webkit.org
- Date
- 2015-08-05 03:21:22 -0700 (Wed, 05 Aug 2015)
Log Message
Merge r184063 - CMake defines CAIROGL_FOUND, not CAIRO_GL_FOUND
https://bugs.webkit.org/show_bug.cgi?id=144846
Patch by Philip Chimento <philip.chime...@gmail.com> on 2015-05-10
Reviewed by Martin Robinson.
* Source/cmake/FindCairoGL.cmake: Use CAIROGL_* instead of
CAIRO_GL_* throughout, because find_package will define
CAIROGL_FOUND.
* Source/cmake/OptionsGTK.cmake: Ditto.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/ChangeLog (187955 => 187956)
--- releases/WebKitGTK/webkit-2.8/ChangeLog 2015-08-05 10:10:44 UTC (rev 187955)
+++ releases/WebKitGTK/webkit-2.8/ChangeLog 2015-08-05 10:21:22 UTC (rev 187956)
@@ -1,3 +1,15 @@
+2015-05-10 Philip Chimento <philip.chime...@gmail.com>
+
+ CMake defines CAIROGL_FOUND, not CAIRO_GL_FOUND
+ https://bugs.webkit.org/show_bug.cgi?id=144846
+
+ Reviewed by Martin Robinson.
+
+ * Source/cmake/FindCairoGL.cmake: Use CAIROGL_* instead of
+ CAIRO_GL_* throughout, because find_package will define
+ CAIROGL_FOUND.
+ * Source/cmake/OptionsGTK.cmake: Ditto.
+
2015-07-17 Ting-Wei Lan <lant...@gmail.com>
Bring back the GNU ar check to create thin archives on non-Linux systems
Modified: releases/WebKitGTK/webkit-2.8/Source/cmake/FindCairoGL.cmake (187955 => 187956)
--- releases/WebKitGTK/webkit-2.8/Source/cmake/FindCairoGL.cmake 2015-08-05 10:10:44 UTC (rev 187955)
+++ releases/WebKitGTK/webkit-2.8/Source/cmake/FindCairoGL.cmake 2015-08-05 10:21:22 UTC (rev 187956)
@@ -1,9 +1,9 @@
# - Try to find CairoGL
# Once done, this will define
#
-# CAIRO_GL_FOUND - system has CairoGL
-# CAIRO_GL_INCLUDE_DIRS - the CairoGL include directories
-# CAIRO_GL_LIBRARIES - link these to use CairoGL
+# CAIROGL_FOUND - system has CairoGL
+# CAIROGL_INCLUDE_DIRS - the CairoGL include directories
+# CAIROGL_LIBRARIES - link these to use CairoGL
#
# Copyright (C) 2014 Igalia S.L.
#
@@ -29,18 +29,18 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
find_package(PkgConfig)
-pkg_check_modules(CAIRO_GL cairo-gl)
+pkg_check_modules(CAIROGL cairo-gl)
# At the moment CairoGL does not add any extra cflags and libraries, so we can
-# safely ignore CAIRO_GL_LIBRARIES and CAIRO_GL_INCLUDE_DIRS for the moment.
+# safely ignore CAIROGL_LIBRARIES and CAIROGL_INCLUDE_DIRS for the moment.
foreach (_component ${CairoGL_FIND_COMPONENTS})
string(TOUPPER ${_component} _UPPER_NAME)
string(REGEX REPLACE "-" "_" _UPPER_NAME ${_UPPER_NAME})
pkg_check_modules(${_UPPER_NAME} ${_component})
- set(CAIRO_GL_INCLUDE_DIRS ${CAIRO_GL_INCLUDE_DIRS} ${_UPPER_NAME}_INCLUDE_DIRS)
- set(CAIRO_GL_LIBRARIES ${CAIRO_GL_LIBRARIES} ${_UPPER_NAME}_LIBRARIES)
+ set(CAIROGL_INCLUDE_DIRS ${CAIROGL_INCLUDE_DIRS} ${_UPPER_NAME}_INCLUDE_DIRS)
+ set(CAIROGL_LIBRARIES ${CAIROGL_LIBRARIES} ${_UPPER_NAME}_LIBRARIES)
endforeach ()
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(CairoGL DEFAULT_MSG CAIRO_GL_INCLUDE_DIRS CAIRO_GL_LIBRARIES)
+find_package_handle_standard_args(CairoGL DEFAULT_MSG CAIROGL_INCLUDE_DIRS CAIROGL_LIBRARIES)
Modified: releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake (187955 => 187956)
--- releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake 2015-08-05 10:10:44 UTC (rev 187955)
+++ releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake 2015-08-05 10:21:22 UTC (rev 187956)
@@ -96,13 +96,13 @@
if (OPENGL_FOUND)
if (GLX_FOUND)
- list(APPEND CAIRO_GL_COMPONENTS cairo-glx)
+ list(APPEND CAIROGL_COMPONENTS cairo-glx)
endif ()
if (EGL_FOUND)
- list(APPEND CAIRO_GL_COMPONENTS cairo-egl)
+ list(APPEND CAIROGL_COMPONENTS cairo-egl)
endif ()
- find_package(CairoGL 1.10.2 COMPONENTS ${CAIRO_GL_COMPONENTS})
- if (CAIRO_GL_FOUND)
+ find_package(CairoGL 1.10.2 COMPONENTS ${CAIROGL_COMPONENTS})
+ if (CAIROGL_FOUND)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS ON)
else ()
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS OFF)
@@ -117,7 +117,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_REDIRECTED_XCOMPOSITE_WINDOW OFF)
endif ()
-if (ENABLE_ACCELERATED_2D_CANVAS AND NOT(CAIRO_GL_FOUND))
+if (ENABLE_ACCELERATED_2D_CANVAS AND NOT(CAIROGL_FOUND))
message(FATAL_ERROR "cairo-gl is needed for Accelerated 2D Canvas support")
endif ()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
