The following commit has been merged in the master branch:
commit b7cb931c156b0cc7ea5c606620d64d48b28990bd
Author: Jan Dittberner <[email protected]>
Date: Mon Apr 5 21:14:37 2010 +0200
fix java build with cmake 2.8
diff --git a/debian/changelog b/debian/changelog
index 60d051d..8672beb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ spring (0.81.2.1+dfsg1-3) UNRELEASED; urgency=low
-DAI_FIND_QUIETLY=FALSE
- add debian/patches/0002-use-Debian-java-libs.patch to use jar files
from libvecmath-java and libjna-java
+ - add debian/patches/0003-fix-cmake-2_8-java-build.patch to fix cmake 2.8
+ java compilation issue
-- Jan Dittberner <[email protected]> Mon, 05 Apr 2010 00:59:08 +0200
diff --git a/debian/patches/0003-fix-cmake-2_8-java-build.patch
b/debian/patches/0003-fix-cmake-2_8-java-build.patch
new file mode 100644
index 0000000..78aaa0b
--- /dev/null
+++ b/debian/patches/0003-fix-cmake-2_8-java-build.patch
@@ -0,0 +1,11 @@
+Subject: make JAVA_COMPILE and JAVA_ARCHIVE globally available in CMake 2.8
+Author: Jan Dittberner <[email protected]>
+
+--- a/rts/build/cmake/FindJavaExtended.cmake
++++ b/rts/build/cmake/FindJavaExtended.cmake
+@@ -278,3 +278,5 @@
+ JAVA_PATCH_LEVEL
+ JAVA_VERSION
+ )
++set(JAVA_COMPILE "${JAVA_COMPILE}" CACHE INTERNAL "" FORCE)
++set(JAVA_ARCHIVE "${JAVA_ARCHIVE}" CACHE INTERNAL "" FORCE)
diff --git a/debian/patches/series b/debian/patches/series
index 068ec36..922d393 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+0003-fix-cmake-2_8-java-build.patch
0001-Minor-spelling-fix.patch
0002-use-Debian-java-libs.patch
diff --git a/debian/rules b/debian/rules
index 9df5585..f137781 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ else
endif
override_dh_auto_configure:
- dh_auto_configure -- -DBINDIR=games -DLIBDIR=lib/spring
-DAI_LIBS_DIR=lib/spring -DAI_DATA_DIR=share/games/spring
-DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DMARCH_FLAG=$(MARCH_FLAG)
-DAI_FIND_QUIETLY=FALSE
+ dh_auto_configure -- -DBINDIR=games -DLIBDIR=lib/spring
-DAI_LIBS_DIR=lib/spring -DAI_DATA_DIR=share/games/spring
-DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DMARCH_FLAG=$(MARCH_FLAG)
-DAI_FIND_QUIETLY=FALSE -DJAVA_FIND_REQUIRED=TRUE
override_dh_auto_install:
+dh_auto_install
--
advanced 3D real time strategy game engine
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
