Changeset 180502 in webkit

Timestamp:

Feb 23, 2015 8:06:02 AM (9 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Fails to compile with cmake 3.2.x
​https://bugs.webkit.org/show_bug.cgi?id=141796

With cmake 3.2.x we have to explicitly ask for X11 otherwise the
X11_X11_LIB variable won't be set thus the X11 linker flags won't be
added and the build will fail.

Patch by Tomas Popela <​tpopela@redhat.com> on 2015-02-23
Reviewed by Martin Robinson.

• Source/cmake/OptionsGTK.cmake:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/OptionsGTK.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2015-02-23  Tomas Popela  <tpopela@redhat.com>
+
+        [GTK] Fails to compile with cmake 3.2.x
+        https://bugs.webkit.org/show_bug.cgi?id=141796
+
+        With cmake 3.2.x we have to explicitly ask for X11 otherwise the
+        X11_X11_LIB variable won't be set thus the X11 linker flags won't be
+        added and the build will fail.
+
+        Reviewed by Martin Robinson.
+
+        * Source/cmake/OptionsGTK.cmake:
+
 2015-02-20  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/cmake/OptionsGTK.cmake

@@ -58 +58 @@
 
 if (ENABLE_X11_TARGET)
+    # With cmake 3.2.x we have to explicitly ask for X11 otherwise the X11_X11_LIB
+    # variable won't be set thus the X11 linker flags won't be added and the build
+    # will fail.
+    find_package(X11 REQUIRED)
     # We don't use find_package for GLX because it is part of -lGL, unlike EGL.
     check_include_files("GL/glx.h" GLX_FOUND)