From e2ba1eb2995817b8d4586ba505738aab34d3b9af Mon Sep 17 00:00:00 2001 From: "mcatanzaro@igalia.com" Date: Tue, 28 Apr 2015 05:24:10 +0000 Subject: [PATCH] Unreviewed, fix GTK build after r183452 * Source/cmake/OptionsGTK.cmake: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@183456 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 6 ++++++ Source/cmake/OptionsGTK.cmake | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 104a019..efe54ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-04-28 Michael Catanzaro + + Unreviewed, fix GTK build after r183452 + + * Source/cmake/OptionsGTK.cmake: + 2015-04-27 Michael Catanzaro [GTK] Add one single option to control all OpenGL-related options diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake index 8e84539..f54e3c7 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake @@ -284,7 +284,10 @@ if (ENABLE_OPENGL) SET_AND_EXPOSE_TO_BUILD(WTF_USE_TEXTURE_MAPPER_GL TRUE) SET_AND_EXPOSE_TO_BUILD(WTF_USE_EGL ${EGL_FOUND}) - SET_AND_EXPOSE_TO_BUILD(WTF_USE_GLX (${ENABLE_X11_TARGET} AND ${GLX_FOUND})) + + if (ENABLE_X11_TARGET AND GLX_FOUND) + SET_AND_EXPOSE_TO_BUILD(WTF_USE_GLX TRUE) + endif () SET_AND_EXPOSE_TO_BUILD(WTF_USE_TILED_BACKING_STORE ${ENABLE_THREADED_COMPOSITOR}) SET_AND_EXPOSE_TO_BUILD(WTF_USE_COORDINATED_GRAPHICS ${ENABLE_THREADED_COMPOSITOR}) -- 1.8.3.1