svn commit: r389748 - head/games/megaglest/files

Raphael Kubo da Costa rakuco at FreeBSD.org
Mon Jun 15 20:02:04 UTC 2015


Author: rakuco
Date: Mon Jun 15 20:02:04 2015
New Revision: 389748
URL: https://svnweb.freebsd.org/changeset/ports/389748

Log:
  Add upstream patch to fix the build with CMake 3.2.
  
  In preparation for the upcoming CMake update.

Added:
  head/games/megaglest/files/patch-source__shared_lib__CMakeLists.txt   (contents, props changed)

Added: head/games/megaglest/files/patch-source__shared_lib__CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/megaglest/files/patch-source__shared_lib__CMakeLists.txt	Mon Jun 15 20:02:04 2015	(r389748)
@@ -0,0 +1,21 @@
+commit fc07d9caf22ee609c03b2edd5ca03b17fd5c2098
+Author: Michael Palimaka <kensington at 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)


More information about the svn-ports-head mailing list