Răsfoiți Sursa

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.
Craig Scott 8 ani în urmă
părinte
comite
e42fa012b6
1 a modificat fișierele cu 1 adăugiri și 1 ștergeri
  1. 1 1
      Modules/FindJava.cmake

+ 1 - 1
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_]+)\"")