Skip to content

Commit

Permalink
can not find cairo-gl.h when build webkit with gtk on ubuntu 14.04
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=136576

Reviewed by Carlos Garcia Campos.

CMake should complain if Accelerated 2D Canvas is explicitly
enabled but cairo-gl is not found.

* Source/cmake/OptionsGTK.cmake:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@176787 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
berto@igalia.com committed Dec 4, 2014
1 parent c0541e0 commit 192f248
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
12 changes: 12 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
2014-12-04 Alberto Garcia <berto@igalia.com>

can not find cairo-gl.h when build webkit with gtk on ubuntu 14.04
https://bugs.webkit.org/show_bug.cgi?id=136576

Reviewed by Carlos Garcia Campos.

CMake should complain if Accelerated 2D Canvas is explicitly
enabled but cairo-gl is not found.

* Source/cmake/OptionsGTK.cmake:

2014-12-03 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>

[EFL] Add subtle crypto to the build system
Expand Down
4 changes: 4 additions & 0 deletions Source/cmake/OptionsGTK.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ else ()
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS OFF)
endif ()

if (ENABLE_ACCELERATED_2D_CANVAS AND NOT(CAIRO_GL_FOUND))
message(FATAL_ERROR "cairo-gl is needed for Accelerated 2D Canvas support")
endif ()

if (GEOCLUE2_FOUND OR GEOCLUE_FOUND)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION ON)
else ()
Expand Down

0 comments on commit 192f248

Please sign in to comment.