Add upstream patch to fix the build with CMake 3.2.

In preparation for the upcoming CMake update.
This commit is contained in:
Raphael Kubo da Costa 2015-06-15 20:02:04 +00:00
parent 394bb077be
commit 5d0bbb55f6
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=389748

View File

@ -0,0 +1,21 @@
commit fc07d9caf22ee609c03b2edd5ca03b17fd5c2098
Author: Michael Palimaka <kensington@gentoo.org>
Date: Wed May 13 04:22:45 2015 +1000
Fix build with >=cmake-3.2.
The FindOpenGL module no longer pulls in X11 libraries.
--- source/shared_lib/CMakeLists.txt
+++ source/shared_lib/CMakeLists.txt
@@ -95,6 +95,10 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY})
ENDIF()
+ IF(UNIX)
+ FIND_PACKAGE(X11 REQUIRED)
+ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${X11_LIBRARIES})
+ ENDIF()
IF(WANT_XERCES)
FIND_PACKAGE(XercesC REQUIRED)