kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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)

This commit is contained in:
Mathieu Malaterre 2009-11-02 09:23:11 -05:00
parent d4b8945301
commit ff0ff68967
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Modules/FindJava.cmake
View File

@ -38,10 +38,8 @@ SET(JAVA_BIN_PATH
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;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" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin"
$ENV{JAVA_HOME}/bin $ENV{JAVA_HOME}/bin
/usr/bin
/usr/lib/java/bin /usr/lib/java/bin
/usr/share/java/bin /usr/share/java/bin
/usr/local/bin
/usr/local/java/bin /usr/local/java/bin
/usr/local/java/share/bin /usr/local/java/share/bin
/usr/java/j2sdk1.4.2_04 /usr/java/j2sdk1.4.2_04
@ -52,8 +50,7 @@ SET(JAVA_BIN_PATH
) )
FIND_PROGRAM(Java_JAVA_EXECUTABLE FIND_PROGRAM(Java_JAVA_EXECUTABLE
NAMES java NAMES java
PATHS ${JAVA_BIN_PATH} HINTS ${JAVA_BIN_PATH}
NO_DEFAULT_PATH
) )
IF(Java_JAVA_EXECUTABLE) IF(Java_JAVA_EXECUTABLE)
@ -115,14 +112,12 @@ ENDIF(Java_JAVA_EXECUTABLE)
FIND_PROGRAM(Java_JAR_EXECUTABLE FIND_PROGRAM(Java_JAR_EXECUTABLE
NAMES jar NAMES jar
PATHS ${JAVA_BIN_PATH} HINTS ${JAVA_BIN_PATH}
NO_DEFAULT_PATH
) )
FIND_PROGRAM(Java_JAVAC_EXECUTABLE FIND_PROGRAM(Java_JAVAC_EXECUTABLE
NAMES javac NAMES javac
PATHS ${JAVA_BIN_PATH} HINTS ${JAVA_BIN_PATH}
NO_DEFAULT_PATH
) )
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)