diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-05 13:45:09 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-05-05 13:45:30 (GMT) |
| commit | 718f0c24f7c0ea9170c8843e17d88fb8eee70235 (patch) | |
| tree | f46107f3072fd73a0764ebe8e782a4760be38dd2 | |
| parent | d90bf11e2fbae39d8fc939ad77c8a8ec2c3a3dce (diff) | |
| parent | f5a3ec4d76f24e15995d70736f671fa55c1ee798 (diff) | |
| download | CMake-718f0c24f7c0ea9170c8843e17d88fb8eee70235.zip CMake-718f0c24f7c0ea9170c8843e17d88fb8eee70235.tar.gz CMake-718f0c24f7c0ea9170c8843e17d88fb8eee70235.tar.bz2 | |
Merge topic 'findjava-openjdk9'
f5a3ec4d FindJava: Add support for OpenJDK early access builds
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !797
| -rw-r--r-- | Modules/FindJava.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake index 4265a97..3d32560 100644 --- a/Modules/FindJava.cmake +++ b/Modules/FindJava.cmake @@ -143,6 +143,9 @@ if(Java_JAVA_EXECUTABLE) if(var MATCHES "java version \"([0-9]+\\.[0-9]+\\.[0-9_.]+.*)\"") # This is most likely Sun / OpenJDK, or maybe GCJ-java compat layer set(Java_VERSION_STRING "${CMAKE_MATCH_1}") + elseif(var MATCHES "openjdk version \"([0-9]+)-[a-z]+\"") + # OpenJDK 9 early access builds or locally built + set(Java_VERSION_STRING "1.${CMAKE_MATCH_1}.0") elseif(var MATCHES "java full version \"kaffe-([0-9]+\\.[0-9]+\\.[0-9_]+)\"") # Kaffe style set(Java_VERSION_STRING "${CMAKE_MATCH_1}") |