summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorMathieu Malaterre <mathieu.malaterre@gmail.com>2009-10-30 15:55:57 (GMT)
committerMathieu Malaterre <mathieu.malaterre@gmail.com>2009-10-30 15:55:57 (GMT)
commit74805dbbbd018989e427c29d39b2ae9dd15b6823 (patch)
treed3dacb0ada67639a03802305e9ac628ae039584f /Modules
parent17ad96111bf75a39695ee4c84a6d0ee410e98c00 (diff)
downloadCMake-74805dbbbd018989e427c29d39b2ae9dd15b6823.zip
CMake-74805dbbbd018989e427c29d39b2ae9dd15b6823.tar.gz
CMake-74805dbbbd018989e427c29d39b2ae9dd15b6823.tar.bz2
ENH: FIX 0009777. This should sync FindJava and CMakeDetermineJavaCompiler.cmake now
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CMakeDetermineJavaCompiler.cmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/CMakeDetermineJavaCompiler.cmake b/Modules/CMakeDetermineJavaCompiler.cmake
index ee7ccb0..483db6b 100644
--- a/Modules/CMakeDetermineJavaCompiler.cmake
+++ b/Modules/CMakeDetermineJavaCompiler.cmake
@@ -51,14 +51,18 @@ IF(NOT CMAKE_Java_COMPILER)
"[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/bin
/usr/lib/java/bin
/usr/share/java/bin
/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
IF(CMAKE_Java_COMPILER_INIT)