View Issue Details [ Jump to Notes ]

Project

Tags

No tags attached.

findjni.cmake.patch [^] (997 bytes) 2009-09-02 05:35 [Show Content] [Hide Content]

Index: FindJNI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v
retrieving revision 1.40
diff -u -r1.40 FindJNI.cmake
--- FindJNI.cmake	21 Apr 2009 21:12:32 -0000	1.40
+++ FindJNI.cmake	2 Sep 2009 09:29:38 -0000
@@ -19,9 +19,16 @@
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
-  $ENV{JAVA_HOME}/jre/lib/i386
+  $ENV{JAVA_HOME}/jre/lib/alpha
   $ENV{JAVA_HOME}/jre/lib/amd64
+  $ENV{JAVA_HOME}/jre/lib/arm
+  $ENV{JAVA_HOME}/jre/lib/i386
+  $ENV{JAVA_HOME}/jre/lib/ia64
+  $ENV{JAVA_HOME}/jre/lib/mips
+  $ENV{JAVA_HOME}/jre/lib/mipsel
   $ENV{JAVA_HOME}/jre/lib/ppc
+  $ENV{JAVA_HOME}/jre/lib/s390
+  $ENV{JAVA_HOME}/jre/lib/sparc
   $ENV{JAVA_HOME}/lib
   /usr/lib
   /usr/local/lib

findjni2.cmake.patch [^] (1,132 bytes) 2009-09-02 06:54 [Show Content] [Hide Content]

Index: FindJNI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v
retrieving revision 1.40
diff -u -r1.40 FindJNI.cmake
--- FindJNI.cmake	21 Apr 2009 21:12:32 -0000	1.40
+++ FindJNI.cmake	2 Sep 2009 10:53:12 -0000
@@ -19,9 +19,20 @@
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
-  $ENV{JAVA_HOME}/jre/lib/i386
+  $ENV{JAVA_HOME}/jre/lib/alpha
   $ENV{JAVA_HOME}/jre/lib/amd64
+  $ENV{JAVA_HOME}/jre/lib/arm
+  $ENV{JAVA_HOME}/jre/lib/i386
+  $ENV{JAVA_HOME}/jre/lib/ia64
+  $ENV{JAVA_HOME}/jre/lib/m68k
+  $ENV{JAVA_HOME}/jre/lib/mips
+  $ENV{JAVA_HOME}/jre/lib/mipsel
+  $ENV{JAVA_HOME}/jre/lib/parisc
+  $ENV{JAVA_HOME}/jre/lib/powerpc
   $ENV{JAVA_HOME}/jre/lib/ppc
+  $ENV{JAVA_HOME}/jre/lib/s390
+  $ENV{JAVA_HOME}/jre/lib/sparc
+  $ENV{JAVA_HOME}/jre/lib/x86_64
   $ENV{JAVA_HOME}/lib
   /usr/lib
   /usr/local/lib

Relationships

child of

0009777

closed

Mathieu Malaterre

FindJNI update not found in FindJava / CMakeDetermineJavaCompiler

Notes
(0017300) Mathieu Malaterre (developer) 2009-09-02 06:53	Adding more arch. Please discard first patch and use second one.

(0017301) Mathieu Malaterre (developer) 2009-09-02 06:55	Reference to bug in debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=544674 [^]

(0017568) Mathieu Malaterre (developer) 2009-09-16 13:32	Could it be possible that the attached patch be applied before the next cmake release ? This is a blocking feature right now in debian to build VTK thank you !

(0017570) Bill Hoffman (manager) 2009-09-16 14:20	cvs commit -m "Bug 0009476, add more search paths for jni." FindJNI.cmake Committer: Bill Hoffman <bill.hoffman@kitware.com> /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v <-- FindJNI.cmake new revision: 1.41; previous revision: 1.40

Issue History
Date Modified	Username	Field	Change
2009-09-02 05:35	Mathieu Malaterre	New Issue
2009-09-02 05:35	Mathieu Malaterre	File Added: findjni.cmake.patch
2009-09-02 06:53	Mathieu Malaterre	Note Added: 0017300
2009-09-02 06:54	Mathieu Malaterre	File Added: findjni2.cmake.patch
2009-09-02 06:55	Mathieu Malaterre	Note Added: 0017301
2009-09-11 17:23	Bill Hoffman	Status	new => assigned
2009-09-11 17:23	Bill Hoffman	Assigned To	=> Bill Hoffman
2009-09-16 13:32	Mathieu Malaterre	Note Added: 0017568
2009-09-16 14:20	Bill Hoffman	Note Added: 0017570
2009-09-16 14:20	Bill Hoffman	Status	assigned => closed
2009-09-16 14:20	Bill Hoffman	Resolution	open => fixed
2009-10-26 05:02	Mathieu Malaterre	Relationship added	child of 0009777