Changeset 166702 in webkit

Timestamp:

Apr 3, 2014 12:27:58 AM (10 years ago)

Author:

rakuco@webkit.org

Message:

[GTK][CMake] Look for glx.h in OPENGL_INCLUDE_DIR.
​https://bugs.webkit.org/show_bug.cgi?id=131095

Reviewed by Martin Robinson.

One needs to take into account OpenGL's include directory found via
find_package() when looking for glx.h, since if the former is a
non-standard location the latter will also be. If this is not it is
possible that OpenGL is found but GLX support is not properly detected.

• Source/cmake/OptionsGTK.cmake:

Location:

trunk

Files:

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

trunk/ChangeLog

@@ +1 @@
+2014-04-02  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.com>
+
+        [GTK][CMake] Look for glx.h in OPENGL_INCLUDE_DIR.
+        https://bugs.webkit.org/show_bug.cgi?id=131095
+
+        Reviewed by Martin Robinson.
+
+        One needs to take into account OpenGL's include directory found via
+        find_package() when looking for glx.h, since if the former is a
+        non-standard location the latter will also be. If this is not it is
+        possible that OpenGL is found but GLX support is not properly detected.
+
+        * Source/cmake/OptionsGTK.cmake:
+
 2014-04-02  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/cmake/OptionsGTK.cmake

@@ -223 +223 @@
 endif ()
 
+find_package(OpenGL)
+
+# This part can be simplified once CMake 2.8.6 is required and
+# CMakePushCheckState can be used. We need to have OPENGL_INCLUDE_DIR as part
+# of the directories check_include_files() looks for in case OpenGL is
+# installed into a non-standard location.
+set(REQUIRED_INCLUDES_OLD ${CMAKE_REQUIRED_INCLUDES})
+set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OPENGL_INCLUDE_DIR})
 # We don't use find_package for GLX because it is part of -lGL, unlike EGL.
-find_package(OpenGL)
 check_include_files("GL/glx.h" GLX_FOUND)
+set(CMAKE_REQUIRED_INCLUDES ${REQUIRED_INCLUDES_OLD})
+
 find_package(EGL)
-
 if (EGL_FOUND)
     set(WTF_USE_EGL 1)