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

diff --git a/ChangeLog b/ChangeLog
index 104a019..efe54ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-04-28  Michael Catanzaro <mcatanzaro@igalia.com>
+
+        Unreviewed, fix GTK build after r183452
+
+        * Source/cmake/OptionsGTK.cmake:
+

 2015-04-27  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         [GTK] Add one single option to control all OpenGL-related options
 2015-04-27  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         [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 (file)
--- 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_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})
 
     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})