blob: da784d4b841141a8043e3a3dbb9ba17b46e5987e (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
|
--- ./Modules/FindJava.cmake.orig 2010-04-16 16:49:52.000000000 +1100
+++ ./Modules/FindJava.cmake 2010-04-16 16:51:27.398957616 +1100
@@ -107,7 +107,7 @@
# 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_.]+)[oem-]*\".*"
"\\1" Java_VERSION_STRING "${var}" )
|
