Add upstream commit to find X11 directly.

Fixes the build with the upcoming CMake 3.2 update, since its
FindOpenGL.cmake does not check for X11 anymore.
This commit is contained in:
Raphael Kubo da Costa 2015-06-15 22:09:14 +00:00
parent 8abcfe50b7
commit a9fef3fd7e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=389758

View file

@ -0,0 +1,20 @@
Required for CMake 3.2 to work, precisely because FindOpenGL.cmake does not
check for X11 anymore.
commit 148ce85b26925e38ced2f196475086eb7884fb62
Author: Maxime Gauduin <alucryd@gmail.com>
Date: Fri Mar 13 12:58:08 2015 +0100
Include the FindX11 module
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -415,8 +445,7 @@
add_definitions(-DHAVE_WAYLAND=0)
endif(USE_WAYLAND AND WAYLAND_FOUND)
- # Note: We do not need to explicitly check for X11 as it is done in the cmake
- # FindOpenGL module on linux.
+ include(FindX11)
if(USE_X11 AND X11_FOUND)
set(USE_X11 1)
add_definitions(-DHAVE_X11=1)