[Cmake-commits] [cmake-commits] malaterre committed CMakeDetermineJavaCompiler.cmake 1.15 1.16

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv392

Modified Files:
	CMakeDetermineJavaCompiler.cmake 
Log Message:
ENH: FIX 0009777. This should sync FindJava and CMakeDetermineJavaCompiler.cmake now


Index: CMakeDetermineJavaCompiler.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineJavaCompiler.cmake,v
retrieving revision 1.15
retrieving revision 1.16
diff -C 2 -d -r1.15 -r1.16
*** CMakeDetermineJavaCompiler.cmake	28 Sep 2009 15:46:47 -0000	1.15
--- CMakeDetermineJavaCompiler.cmake	30 Oct 2009 15:55:57 -0000	1.16
***************
*** 52,55 ****
--- 52,56 ----
      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/bin"
      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin"
+     $ENV{JAVA_HOME}/bin
      /usr/bin
      /usr/lib/java/bin
***************
*** 57,63 ****
--- 58,67 ----
      /usr/local/bin
      /usr/local/java/bin
+     /usr/local/java/share/bin
      /usr/java/j2sdk1.4.2_04
      /usr/lib/j2sdk1.4-sun/bin
+     /usr/java/j2sdk1.4.2_09/bin
      /usr/lib/j2sdk1.5-sun/bin
+     /opt/sun-jdk-1.5.0.04/bin
      )
    # if no compiler has been specified yet, then look for one