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

BUG: hardcoded path, are not hints. Split the two lists. Thanks Brad

Browse Source
This commit is contained in:
Mathieu Malaterre 2009-11-02 11:37:16 -05:00
parent ca73562e54
commit ccb8accc1b
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Modules/FindJava.cmake
View File

@ -28,7 +28,8 @@
# (To distributed this file outside of CMake, substitute the full # (To distributed this file outside of CMake, substitute the full
# License text for the above reference.) # License text for the above reference.)
SET(JAVA_BIN_PATH # 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\\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.9;JavaHome]/bin"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.8;JavaHome]/bin" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.8;JavaHome]/bin"
@ -38,6 +39,10 @@ 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
)
# 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/lib/java/bin
/usr/share/java/bin /usr/share/java/bin
/usr/local/java/bin /usr/local/java/bin
@ -50,7 +55,8 @@ SET(JAVA_BIN_PATH
) )
FIND_PROGRAM(Java_JAVA_EXECUTABLE FIND_PROGRAM(Java_JAVA_EXECUTABLE
NAMES java NAMES java
HINTS ${JAVA_BIN_PATH} HINTS ${_JAVA_HINTS}
PATHS ${_JAVA_PATHS}
) )
IF(Java_JAVA_EXECUTABLE) IF(Java_JAVA_EXECUTABLE)
@ -112,12 +118,14 @@ ENDIF(Java_JAVA_EXECUTABLE)
FIND_PROGRAM(Java_JAR_EXECUTABLE FIND_PROGRAM(Java_JAR_EXECUTABLE
NAMES jar NAMES jar
HINTS ${JAVA_BIN_PATH} HINTS ${_JAVA_HINTS}
PATHS ${_JAVA_PATHS}
) )
FIND_PROGRAM(Java_JAVAC_EXECUTABLE FIND_PROGRAM(Java_JAVAC_EXECUTABLE
NAMES javac NAMES javac
HINTS ${JAVA_BIN_PATH} HINTS ${_JAVA_HINTS}
PATHS ${_JAVA_PATHS}
) )
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)