diff options
| author | Craig Scott <craig.scott@crascit.com> | 2017-07-28 11:15:35 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-07-28 11:17:52 (GMT) |
| commit | d2d8e9edf32ec9b8c5a3761ecaad682c7fcdf9ed (patch) | |
| tree | c439ca4fff4671de38a06c302c995f442e7cad5a | |
| parent | bfb40bcf666050feb9913131a8f6c0e9b7f57299 (diff) | |
| parent | e42fa012b6c3e1ce8f7c8bdcaa87f768d8f4037e (diff) | |
| download | CMake-d2d8e9edf32ec9b8c5a3761ecaad682c7fcdf9ed.zip CMake-d2d8e9edf32ec9b8c5a3761ecaad682c7fcdf9ed.tar.gz CMake-d2d8e9edf32ec9b8c5a3761ecaad682c7fcdf9ed.tar.bz2 | |
Merge topic 'FindJava_earlyAccessDebian'
e42fa012 Allow early access version trailing string to be mixed case
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: Felix Geyer <debfx@fobos.de>
Merge-request: !1080
| -rw-r--r-- | Modules/FindJava.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake index 3d32560..d762452 100644 --- a/Modules/FindJava.cmake +++ b/Modules/FindJava.cmake @@ -143,7 +143,7 @@ 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]+\"") + elseif(var MATCHES "openjdk version \"([0-9]+)-[A-Za-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_]+)\"") |