cmake configuration modified to build on i386 too

CMakeLists.txt

@@ -3,9 +3,15 @@
 # to the root binary directory of the project as ${xtandemparser_BINARY_DIR}.
 PROJECT(xtandempipeline Java)
 
-SET (CMAKE_Java_COMPILER "/usr/lib/jvm/java-6-openjdk-amd64/bin/java")
-SET (Java_JAR_EXECUTABLE "/usr/lib/jvm/java-6-openjdk-amd64/bin/jar")
-SET (Java_JAVAC_EXECUTABLE "/usr/lib/jvm/java-6-openjdk-amd64/bin/javac")
+SET (CMAKE_Java_COMPILER "/usr/lib/jvm/java-6-openjdk-i386/bin/java")
+SET (Java_JAR_EXECUTABLE "/usr/lib/jvm/java-6-openjdk-i386/bin/jar")
+SET (Java_JAVAC_EXECUTABLE "/usr/lib/jvm/java-6-openjdk-i386/bin/javac")
+IF (EXISTS /usr/lib/jvm/java-6-openjdk-amd64)
+	SET (CMAKE_Java_COMPILER "/usr/lib/jvm/java-6-openjdk-amd64/bin/java")
+	SET (Java_JAR_EXECUTABLE "/usr/lib/jvm/java-6-openjdk-amd64/bin/jar")
+	SET (Java_JAVAC_EXECUTABLE "/usr/lib/jvm/java-6-openjdk-amd64/bin/javac")
+ENDIF (EXISTS /usr/lib/jvm/java-6-openjdk-amd64)
+
 SET (ANT_EXECUTABLE "/usr/bin/ant")
 
 SET (MASCOT_DAT_FILE_JAR "mascotdatfile-3.4.9.jar")

debian/rules

@@ -14,7 +14,7 @@
 
 configure: configure-stamp
 configure-stamp:
-	cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_Java_COMPILER=/usr/lib/jvm/java-6-openjdk-amd64/bin/java .
+	cmake -DCMAKE_INSTALL_PREFIX=/usr .
 	dh_testdir
 	# Add here commands to configure the package.
 

share/xtandempipeline/xtandempipeline.sh.cmake

 #!/bin/bash
 
 if [ $(uname -m) == "x86_64" ]; then
-	@CMAKE_Java_COMPILER@ -Xmx3000m -Xms256m -jar @CMAKE_INSTALL_PREFIX@/share/xtandempipeline/XtandemPipeline.jar $1
+	/usr/lib/jvm/java-6-openjdk-amd64/bin/java -Xmx3000m -Xms256m -jar @CMAKE_INSTALL_PREFIX@/share/xtandempipeline/XtandemPipeline.jar $1
 else
-	@CMAKE_Java_COMPILER@ -Xmx1500m -Xms256m -jar @CMAKE_INSTALL_PREFIX@/share/xtandempipeline/XtandemPipeline.jar $1
+	/usr/lib/jvm/java-6-openjdk-i386/bin/java -Xmx1500m -Xms256m -jar @CMAKE_INSTALL_PREFIX@/share/xtandempipeline/XtandemPipeline.jar $1
 fi