summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrakuco <rakuco@FreeBSD.org>2015-06-15 20:02:04 +0000
committerrakuco <rakuco@FreeBSD.org>2015-06-15 20:02:04 +0000
commitad705135d3bca2cd1e154442f9a4d9f5170a2f50 (patch)
tree99634bcd3c69ee56664bd50db45ecc5c6d1d53ef
parentd142a91e3fa8d4a5388f271437677850184f97d6 (diff)
downloadFreeBSD-ports-ad705135d3bca2cd1e154442f9a4d9f5170a2f50.zip
FreeBSD-ports-ad705135d3bca2cd1e154442f9a4d9f5170a2f50.tar.gz
Add upstream patch to fix the build with CMake 3.2.
In preparation for the upcoming CMake update.
-rw-r--r--games/megaglest/files/patch-source__shared_lib__CMakeLists.txt21
1 files changed, 21 insertions, 0 deletions
diff --git a/games/megaglest/files/patch-source__shared_lib__CMakeLists.txt b/games/megaglest/files/patch-source__shared_lib__CMakeLists.txt
new file mode 100644
index 0000000..1f318bd
--- /dev/null
+++ b/games/megaglest/files/patch-source__shared_lib__CMakeLists.txt
@@ -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)
OpenPOWER on IntegriCloud