<html>
<head>
<base href="https://bugs.webkit.org/" />
</head>
<body><table border="1" cellspacing="0" cellpadding="8">
<tr>
<th>Bug ID</th>
<td><a class="bz_bug_link
bz_status_NEW "
title="NEW - [GTK] Useless code in OptionsGTK.cmake"
href="https://bugs.webkit.org/show_bug.cgi?id=143640">143640</a>
</td>
</tr>
<tr>
<th>Summary</th>
<td>[GTK] Useless code in OptionsGTK.cmake
</td>
</tr>
<tr>
<th>Classification</th>
<td>Unclassified
</td>
</tr>
<tr>
<th>Product</th>
<td>WebKit
</td>
</tr>
<tr>
<th>Version</th>
<td>528+ (Nightly build)
</td>
</tr>
<tr>
<th>Hardware</th>
<td>PC
</td>
</tr>
<tr>
<th>OS</th>
<td>Linux
</td>
</tr>
<tr>
<th>Status</th>
<td>NEW
</td>
</tr>
<tr>
<th>Severity</th>
<td>Minor
</td>
</tr>
<tr>
<th>Priority</th>
<td>P2
</td>
</tr>
<tr>
<th>Component</th>
<td>WebKit Gtk
</td>
</tr>
<tr>
<th>Assignee</th>
<td>webkit-unassigned@lists.webkit.org
</td>
</tr>
<tr>
<th>Reporter</th>
<td>mcatanzaro@igalia.com
</td>
</tr></table>
<p>
<div>
<pre>In OptionsGTK.cmake we have this:
# 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.
if (ENABLE_X11_TARGET)
set(REQUIRED_INCLUDES_OLD ${CMAKE_REQUIRED_INCLUDES})
set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OPENGL_INCLUDE_DIR})
set(CMAKE_REQUIRED_INCLUDES ${REQUIRED_INCLUDES_OLD})
...
endif ()
Which does nothing. This broke sometime recentlyish when the check for GLX moved elsewhere in the file. Should be:
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.
check_include_files("GL/glx.h" GLX_FOUND)
set(CMAKE_REQUIRED_INCLUDES ${REQUIRED_INCLUDES_OLD})
I will fix this in <a class="bz_bug_link
bz_status_NEW "
title="NEW - [GTK] Mark as advanced the build options we don't want to expose"
href="show_bug.cgi?id=143558">bug #143558</a>, since it is hard to split my changes to OptionsGTK.cmake into multiple patches. I'm filing this bug just to make sure we don't lose track of it.</pre>
</div>
</p>
<hr>
<span>You are receiving this mail because:</span>
<ul>
<li>You are the assignee for the bug.</li>
</ul>
</body>
</html>