diff options
| author | Craig Scott <craig.scott@crascit.com> | 2017-07-25 12:23:55 (GMT) |
|---|---|---|
| committer | Craig Scott <craig.scott@crascit.com> | 2017-07-25 12:35:45 (GMT) |
| commit | e42fa012b6c3e1ce8f7c8bdcaa87f768d8f4037e (patch) | |
| tree | aa02ce6bd0b510058b878727e34fa0c35e7beabf /Modules | |
| parent | f15cfd891d1e01247ed285320ae32b6c3182ac8f (diff) | |
| download | CMake-e42fa012b6c3e1ce8f7c8bdcaa87f768d8f4037e.zip CMake-e42fa012b6c3e1ce8f7c8bdcaa87f768d8f4037e.tar.gz CMake-e42fa012b6c3e1ce8f7c8bdcaa87f768d8f4037e.tar.bz2 | |
Allow early access version trailing string to be mixed case
The original regex was expecting to match strings like "ea", but it has
been reported that other strings like "Debian" are also possible.
Diffstat (limited to 'Modules')
| -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_]+)\"") |