diff options
| author | Brad King <brad.king@kitware.com> | 2011-04-12 18:44:13 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-04-12 18:44:13 (GMT) |
| commit | 65a05b8ff0a3bcd4e300e744b5723d0fcb525c68 (patch) | |
| tree | c4ed5ef40c5ba3fa152ddd0962358a616ac35e62 /Modules | |
| parent | dff009626dc062657c6f433472c5a2d02cd0a14a (diff) | |
| parent | 5f7683317ab45708ee11974f2d4e445069729913 (diff) | |
| download | CMake-65a05b8ff0a3bcd4e300e744b5723d0fcb525c68.zip CMake-65a05b8ff0a3bcd4e300e744b5723d0fcb525c68.tar.gz CMake-65a05b8ff0a3bcd4e300e744b5723d0fcb525c68.tar.bz2 | |
Merge topic 'fixbug_0011676'
5f76833 Add support for Java on HP
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindJava.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake index 8c2128e..6431836 100644 --- a/Modules/FindJava.cmake +++ b/Modules/FindJava.cmake @@ -42,7 +42,7 @@ #============================================================================= # Copyright 2002-2009 Kitware, Inc. -# Copyright 2009 Mathieu Malaterre <mathieu.malaterre@gmail.com> +# Copyright 2009-2011 Mathieu Malaterre <mathieu.malaterre@gmail.com> # # Distributed under the OSI-approved BSD License (the "License"); # see accompanying file Copyright.txt for details. @@ -105,9 +105,9 @@ IF(Java_JAVA_EXECUTABLE) # 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 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}" ) ELSEIF(var MATCHES "java full version \"kaffe-[0-9]+\\.[0-9]+\\.[0-9_]+\".*") # Kaffe style @@ -122,7 +122,7 @@ IF(Java_JAVA_EXECUTABLE) STRING( REGEX REPLACE "[0-9]+\\.([0-9]+).*" "\\1" Java_VERSION_MINOR "${Java_VERSION_STRING}" ) STRING( REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" Java_VERSION_PATCH "${Java_VERSION_STRING}" ) # warning tweak version can be empty: - STRING( REGEX REPLACE "[0-9]+\\.[0-9]+\\.[0-9]+\\_?([0-9]*)$" "\\1" Java_VERSION_TWEAK "${Java_VERSION_STRING}" ) + STRING( REGEX REPLACE "[0-9]+\\.[0-9]+\\.[0-9]+\\_?\\.?([0-9]*)$" "\\1" Java_VERSION_TWEAK "${Java_VERSION_STRING}" ) if( Java_VERSION_TWEAK STREQUAL "" ) # check case where tweak is not defined set(Java_VERSION ${Java_VERSION_MAJOR}.${Java_VERSION_MINOR}.${Java_VERSION_PATCH}) else( ) |