[Cmake-commits] [cmake-commits] malaterre committed FindJava.cmake 1.22 1.23

[cmake-commits at cmake.org]

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

Modified Files:
	FindJava.cmake 
Log Message:
BUG: hardcoded path, are not hints. Split the two lists. Thanks Brad


Index: FindJava.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJava.cmake,v
retrieving revision 1.22
retrieving revision 1.23
diff -C 2 -d -r1.22 -r1.23
*** FindJava.cmake	2 Nov 2009 14:23:11 -0000	1.22
--- FindJava.cmake	2 Nov 2009 16:37:16 -0000	1.23
***************
*** 29,42 ****
  #  License text for the above reference.)
  
! SET(JAVA_BIN_PATH
!     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\2.0;JavaHome]/bin"
!     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.9;JavaHome]/bin"
!     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.8;JavaHome]/bin"
!     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.7;JavaHome]/bin"
!     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.6;JavaHome]/bin"
!     "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.5;JavaHome]/bin"
!     "[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/lib/java/bin
    /usr/share/java/bin
--- 29,47 ----
  #  License text for the above reference.)
  
! # The HINTS option should only be used for values computed from the system.
! SET(_JAVA_HINTS
!   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\2.0;JavaHome]/bin"
!   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.9;JavaHome]/bin"
!   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.8;JavaHome]/bin"
!   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.7;JavaHome]/bin"
!   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.6;JavaHome]/bin"
!   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.5;JavaHome]/bin"
!   "[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
+   )
+ # Hard-coded guesses should still go in PATHS. This ensures that the user
+ # environment can always override hard guesses.
+ SET(_JAVA_PATHS
    /usr/lib/java/bin
    /usr/share/java/bin
***************
*** 51,55 ****
  FIND_PROGRAM(Java_JAVA_EXECUTABLE
    NAMES java
!   HINTS ${JAVA_BIN_PATH}
  )
  
--- 56,61 ----
  FIND_PROGRAM(Java_JAVA_EXECUTABLE
    NAMES java
!   HINTS ${_JAVA_HINTS}
!   PATHS ${_JAVA_PATHS}
  )
  
***************
*** 113,122 ****
  FIND_PROGRAM(Java_JAR_EXECUTABLE
    NAMES jar
!   HINTS ${JAVA_BIN_PATH}
  )
  
  FIND_PROGRAM(Java_JAVAC_EXECUTABLE
    NAMES javac
!   HINTS ${JAVA_BIN_PATH}
  )
  
--- 119,130 ----
  FIND_PROGRAM(Java_JAR_EXECUTABLE
    NAMES jar
!   HINTS ${_JAVA_HINTS}
!   PATHS ${_JAVA_PATHS}
  )
  
  FIND_PROGRAM(Java_JAVAC_EXECUTABLE
    NAMES javac
!   HINTS ${_JAVA_HINTS}
!   PATHS ${_JAVA_PATHS}
  )