[Cmake-commits] CMake branch, next, updated. v2.8.8-3324-g9d996b2

[Rolf Eike Beer]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  9d996b26288a7c35773109d1653e3e698bb8daa8 (commit)
       via  304562e7b51d17735f8e8980e028a00d88b6d1ea (commit)
       via  eb0922a90c783ad3546ec8f43cc54864fae1ef1f (commit)
       via  2fdc5517b16b5ebe88475d4011be215cc7d1dbf9 (commit)
       via  72ce5889338af7e7c121be0941a2aceecaf7f3ca (commit)
      from  d339cfcb54e3b0af2d24469a5189208d9e2965f8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d996b26288a7c35773109d1653e3e698bb8daa8
commit 9d996b26288a7c35773109d1653e3e698bb8daa8
Merge: d339cfc 304562e
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jun 25 12:54:47 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 25 12:54:47 2012 -0400

    Merge topic 'FindJava-version' into next
    
    304562e FindJava: improve version matching (#12878)
    eb0922a CMake Nightly Date Stamp
    2fdc551 CMake Nightly Date Stamp
    72ce588 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=304562e7b51d17735f8e8980e028a00d88b6d1ea
commit 304562e7b51d17735f8e8980e028a00d88b6d1ea
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jun 25 18:53:53 2012 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Jun 25 18:53:53 2012 +0200

    FindJava: improve version matching (#12878)

diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake
index 34a7077..3457021 100644
--- a/Modules/FindJava.cmake
+++ b/Modules/FindJava.cmake
@@ -107,9 +107,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_.]+.*\".*")
         # 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_.]+.*)\".*"
                 "\\1" Java_VERSION_STRING "${var}" )
       ELSEIF(var MATCHES "java full version \"kaffe-[0-9]+\\.[0-9]+\\.[0-9_]+\".*")
         # Kaffe style
@@ -124,7 +124,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( )

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindJava.cmake    |    6 +++---
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake