diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2012-09-14 19:22:51 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2012-09-14 19:22:51 +0000 |
| commit | e6dd931e2d83f2d95a1c99577711e28f056ba38f (patch) | |
| tree | 1c3b958aee47e2b9f64839dd4dfbbaaa84e4951c /devel/cmake/files/patch-Modules_FindJava.cmake | |
| parent | - Convert to new options framework (diff) | |
Update CMake to 2.8.9.
PR: ports/170654
Diffstat (limited to 'devel/cmake/files/patch-Modules_FindJava.cmake')
| -rw-r--r-- | devel/cmake/files/patch-Modules_FindJava.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/devel/cmake/files/patch-Modules_FindJava.cmake b/devel/cmake/files/patch-Modules_FindJava.cmake index 90148d375086..022de0e639f1 100644 --- a/devel/cmake/files/patch-Modules_FindJava.cmake +++ b/devel/cmake/files/patch-Modules_FindJava.cmake @@ -1,11 +1,11 @@ --- ./Modules/FindJava.cmake.orig 2010-04-16 16:49:52.000000000 +1100 +++ ./Modules/FindJava.cmake 2010-04-16 16:51:27.398957616 +1100 -@@ -90,7 +90,7 @@ +@@ -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_.]+[oem-]*\".*") -+ IF(var MATCHES "[java|openjdk] version \"[0-9]+\\.[0-9]+\\.[0-9_.]+[oem-]*\".*") +- 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}" ) |