This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via d2d8e9edf32ec9b8c5a3761ecaad682c7fcdf9ed (commit)
via e42fa012b6c3e1ce8f7c8bdcaa87f768d8f4037e (commit)
from bfb40bcf666050feb9913131a8f6c0e9b7f57299 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d2d8e9edf32ec9b8c5a3761ecaad682c7fcdf9ed
commit d2d8e9edf32ec9b8c5a3761ecaad682c7fcdf9ed
Merge: bfb40bc e42fa01
Author: Craig Scott <[email protected]>
AuthorDate: Fri Jul 28 11:15:35 2017 +0000
Commit: Kitware Robot <[email protected]>
CommitDate: Fri Jul 28 07:17:52 2017 -0400
Merge topic 'FindJava_earlyAccessDebian'
e42fa012 Allow early access version trailing string to be mixed case
Acked-by: Kitware Robot <[email protected]>
Tested-by: Felix Geyer <[email protected]>
Merge-request: !1080
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e42fa012b6c3e1ce8f7c8bdcaa87f768d8f4037e
commit e42fa012b6c3e1ce8f7c8bdcaa87f768d8f4037e
Author: Craig Scott <[email protected]>
AuthorDate: Tue Jul 25 22:23:55 2017 +1000
Commit: Craig Scott <[email protected]>
CommitDate: Tue Jul 25 22:35:45 2017 +1000
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.
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_]+)\"")
-----------------------------------------------------------------------
Summary of changes:
Modules/FindJava.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/mailman/listinfo/cmake-commits
