You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2014/03/27 19:31:33 UTC
svn commit: r1582437 - /qpid/proton/trunk/tools/cmake/Modules/FindJava.cmake
Author: rhs
Date: Thu Mar 27 18:31:33 2014
New Revision: 1582437
URL: http://svn.apache.org/r1582437
Log:
added case to java version regex
Modified:
qpid/proton/trunk/tools/cmake/Modules/FindJava.cmake
Modified: qpid/proton/trunk/tools/cmake/Modules/FindJava.cmake
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/tools/cmake/Modules/FindJava.cmake?rev=1582437&r1=1582436&r2=1582437&view=diff
==============================================================================
--- qpid/proton/trunk/tools/cmake/Modules/FindJava.cmake (original)
+++ qpid/proton/trunk/tools/cmake/Modules/FindJava.cmake Thu Mar 27 18:31:33 2014
@@ -107,7 +107,7 @@ if(Java_JAVA_EXECUTABLE)
# 2. OpenJDK 1.6
# 3. GCJ 1.5
# 4. Kaffe 1.4.2
- if(var MATCHES "java version \"[0-9]+\\.[0-9]+\\.[0-9_.]+.*\".*")
+ if(var MATCHES "(java|openjdk) version \"[0-9]+\\.[0-9]+\\.[0-9_.]+.*\".*")
# This is most likely Sun / OpenJDK, or maybe GCJ-java compat layer
string( REGEX REPLACE ".* version \"([0-9]+\\.[0-9]+\\.[0-9_.]+.*)\".*"
"\\1" Java_VERSION_STRING "${var}" )
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org