diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2011-10-22 03:36:12 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2011-10-22 03:36:12 +0000 |
| commit | 85aea4a89927c8d9370988a93174d5df6c36fb12 (patch) | |
| tree | 4e44ee9179c8a5f1a90d7c38236d00cc43eb712f /devel/cmake/files/patch-Modules_FindJava.cmake | |
| parent | Require qtestlib only to build the port. (diff) | |
Update CMake to 2.8.6.
Approved by: makc (mentor)
Notes
Notes:
svn path=/head/; revision=284085
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 b55dac924eaa..90148d375086 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_]+[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_.]+[oem-]*\".*") ++ IF(var MATCHES "[java|openjdk] version \"[0-9]+\\.[0-9]+\\.[0-9_.]+[oem-]*\".*") # 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}" ) |