diff options
| author | Brad King <brad.king@kitware.com> | 2017-01-12 15:21:07 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-01-12 15:21:07 (GMT) |
| commit | 2e550e36d29332adda29f85fbf79e1610286ab9b (patch) | |
| tree | 9c813181b6dfd5251990fcade478416f0f77a9eb /Modules | |
| parent | 88a816c6b9b4f5cb11b40410935d47fa61b39858 (diff) | |
| parent | eb728d266e171987616c71a63f3f772eab45ebf3 (diff) | |
| download | CMake-2e550e36d29332adda29f85fbf79e1610286ab9b.zip CMake-2e550e36d29332adda29f85fbf79e1610286ab9b.tar.gz CMake-2e550e36d29332adda29f85fbf79e1610286ab9b.tar.bz2 | |
Merge topic 'FindJava-jre-hints'
eb728d26 FindJava: add hints for jre
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindJava.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake index 5c0abb0..4265a97 100644 --- a/Modules/FindJava.cmake +++ b/Modules/FindJava.cmake @@ -86,6 +86,14 @@ list(APPEND _JAVA_HINTS "[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" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\2.0;JavaHome]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.9;JavaHome]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.8;JavaHome]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.7;JavaHome]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\2.6;JavaHome]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.5;JavaHome]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.4;JavaHome]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Runtime Environment\\1.3;JavaHome]/bin" ) # Hard-coded guesses should still go in PATHS. This ensures that the user # environment can always override hard guesses. |