diff options
| author | Max Brazhnikov <makc@FreeBSD.org> | 2013-03-19 18:00:07 +0000 |
|---|---|---|
| committer | Max Brazhnikov <makc@FreeBSD.org> | 2013-03-19 18:00:07 +0000 |
| commit | bcb788934511e3ae13e6bd8f7b1bb0108483e50e (patch) | |
| tree | e10c5e0a9a34170f89f8c4f6af51ea6ad17ee625 /devel/cmake/files/patch-Modules_FindJava.cmake | |
| parent | Convert USE_CMAKE to USES macro: (diff) | |
- Update cmake to 2.8.10.2
- Trim Makefile header
- Drop indefinite article from COMMENT
Obtained from: area51
Tested by: exp-run (bapt)
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 022de0e639f1..da784d4b8411 100644 --- a/devel/cmake/files/patch-Modules_FindJava.cmake +++ b/devel/cmake/files/patch-Modules_FindJava.cmake @@ -4,8 +4,8 @@ # 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_.]+.*\".*") +- 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-]*\".*" + string( REGEX REPLACE ".* version \"([0-9]+\\.[0-9]+\\.[0-9_.]+)[oem-]*\".*" "\\1" Java_VERSION_STRING "${var}" ) |