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

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Nov 2 09:23:16 EST 2009


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

Modified Files:
	FindJava.cmake 
Log Message:
BUG: To be able to use ENV and at the same time allow /usr/loca/bin to override /usr/bin, apply patch suggested by Hendrik Sattler (thanks)


Index: FindJava.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJava.cmake,v
retrieving revision 1.21
retrieving revision 1.22
diff -C 2 -d -r1.21 -r1.22
*** FindJava.cmake	2 Nov 2009 14:15:04 -0000	1.21
--- FindJava.cmake	2 Nov 2009 14:23:11 -0000	1.22
***************
*** 39,46 ****
      "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin"
    $ENV{JAVA_HOME}/bin
-   /usr/bin
    /usr/lib/java/bin
    /usr/share/java/bin
-   /usr/local/bin
    /usr/local/java/bin
    /usr/local/java/share/bin
--- 39,44 ----
***************
*** 53,58 ****
  FIND_PROGRAM(Java_JAVA_EXECUTABLE
    NAMES java
!   PATHS ${JAVA_BIN_PATH}
!   NO_DEFAULT_PATH
  )
  
--- 51,55 ----
  FIND_PROGRAM(Java_JAVA_EXECUTABLE
    NAMES java
!   HINTS ${JAVA_BIN_PATH}
  )
  
***************
*** 116,127 ****
  FIND_PROGRAM(Java_JAR_EXECUTABLE
    NAMES jar
!   PATHS ${JAVA_BIN_PATH}
!   NO_DEFAULT_PATH
  )
  
  FIND_PROGRAM(Java_JAVAC_EXECUTABLE
    NAMES javac
!   PATHS ${JAVA_BIN_PATH}
!   NO_DEFAULT_PATH
  )
  
--- 113,122 ----
  FIND_PROGRAM(Java_JAR_EXECUTABLE
    NAMES jar
!   HINTS ${JAVA_BIN_PATH}
  )
  
  FIND_PROGRAM(Java_JAVAC_EXECUTABLE
    NAMES javac
!   HINTS ${JAVA_BIN_PATH}
  )
  



More information about the Cmake-commits mailing list