[megaglest] 02/03: Add fix-cmake-3.2-X11-FTBFS.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository megaglest.

commit 387ead3a9e03a39c50c56226733a0ce160cb0596
Author: Markus Koschany <apo at gambaru.de>
Date:   Thu Jun 18 02:38:42 2015 +0200

    Add fix-cmake-3.2-X11-FTBFS.patch
---
 debian/patches/fix-cmake-3.2-X11-FTBFS.patch | 27 +++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 2 files changed, 28 insertions(+)

diff --git a/debian/patches/fix-cmake-3.2-X11-FTBFS.patch b/debian/patches/fix-cmake-3.2-X11-FTBFS.patch
new file mode 100644
index 0000000..1e40b83
--- /dev/null
+++ b/debian/patches/fix-cmake-3.2-X11-FTBFS.patch
@@ -0,0 +1,27 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Thu, 18 Jun 2015 02:37:43 +0200
+Subject: fix cmake-3.2-X11 FTBFS
+
+Fixes a build failure with CMake >= 3.2.
+
+Forwarded: https://github.com/MegaGlest/megaglest-source/issues/65
+---
+ source/shared_lib/CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt
+index 9a4c7c9..4e4c7a4 100644
+--- a/source/shared_lib/CMakeLists.txt
++++ b/source/shared_lib/CMakeLists.txt
+@@ -95,6 +95,11 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
+ 		SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY})
+ 	ENDIF()
+ 
++	FIND_PACKAGE(X11 REQUIRED)
++	INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR})
++	IF(UNIX)
++		SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${X11_LIBRARIES})
++	ENDIF()
+ 
+         IF(WANT_XERCES)
+ 	        FIND_PACKAGE(XercesC REQUIRED)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..054e352
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-cmake-3.2-X11-FTBFS.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/megaglest.git