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, next has been updated
via 4283712685e5e31ff05db587ea7cfcfdc203f447 (commit)
via 7953867ba46223dfab373ce58cff0a4bc20c3864 (commit)
from 1b28de9174cb01ffc2fea5097208a2210934adde (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4283712685e5e31ff05db587ea7cfcfdc203f447
commit 4283712685e5e31ff05db587ea7cfcfdc203f447
Merge: 1b28de9 7953867
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue May 12 13:47:59 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue May 12 13:47:59 2015 -0400
Merge topic 'FindJava-openjdk-8' into next
7953867b FindJava: Fix OpenJDK 8 version detection (#15565)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7953867ba46223dfab373ce58cff0a4bc20c3864
commit 7953867ba46223dfab373ce58cff0a4bc20c3864
Author: Felix Geyer <de...@ubuntu.com>
AuthorDate: Tue May 12 13:45:43 2015 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue May 12 13:46:12 2015 -0400
FindJava: Fix OpenJDK 8 version detection (#15565)
The openjdk-8 (8u45-b14-2) package on Debian unstable has extra
text after the version number components. Match this and add it
to the reported version string.
diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake
index bb73853..9e43174 100644
--- a/Modules/FindJava.cmake
+++ b/Modules/FindJava.cmake
@@ -137,7 +137,7 @@ if(Java_JAVA_EXECUTABLE)
elseif(var MATCHES "java full version
\"kaffe-([0-9]+\\.[0-9]+\\.[0-9_]+)\"")
# Kaffe style
set(Java_VERSION_STRING "${CMAKE_MATCH_1}")
- elseif(var MATCHES "openjdk version \"([0-9]+\\.[0-9]+\\.[0-9_]+)\"")
+ elseif(var MATCHES "openjdk version \"([0-9]+\\.[0-9]+\\.[0-9_]+.*)\"")
# OpenJDK ver 1.7.x on OpenBSD
set(Java_VERSION_STRING "${CMAKE_MATCH_1}")
else()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindJava.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
