diff options
| author | Dima Panov <fluffy@FreeBSD.org> | 2010-05-11 11:59:56 +0000 |
|---|---|---|
| committer | Dima Panov <fluffy@FreeBSD.org> | 2010-05-11 11:59:56 +0000 |
| commit | f639cf8c917c96f905ba43d2961f056fbde7ae50 (patch) | |
| tree | 81f5dc7803ab34c6360e1576e9b7b418a796d514 /devel/cmake/files/patch-Modules_FindJava.cmake | |
| parent | - The FreeBSD KDE team is pleased to announce SIP-4.10.2, PyQt-4.7.3 (diff) | |
- Update CMake to 2.8.1 release
With hat on: kde@
Notes
Notes:
svn path=/head/; revision=254129
Diffstat (limited to 'devel/cmake/files/patch-Modules_FindJava.cmake')
| -rw-r--r-- | devel/cmake/files/patch-Modules_FindJava.cmake | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/devel/cmake/files/patch-Modules_FindJava.cmake b/devel/cmake/files/patch-Modules_FindJava.cmake new file mode 100644 index 000000000000..b55dac924eaa --- /dev/null +++ b/devel/cmake/files/patch-Modules_FindJava.cmake @@ -0,0 +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 @@ + # 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-]*\".*") + # 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}" ) |