[Cmake-commits] [cmake-commits] malaterre committed FindJava.cmake 1.24 1.25

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv24277

Modified Files:
	FindJava.cmake 
Log Message:
Adding support for java 1.6.0-oem. Make sure to report failure when user ask for version but regex failed to parse version number


Index: FindJava.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJava.cmake,v
retrieving revision 1.24
retrieving revision 1.25
diff -C 2 -d -r1.24 -r1.25
*** FindJava.cmake	3 Nov 2009 22:22:57 -0000	1.24
--- FindJava.cmake	4 Nov 2009 10:17:46 -0000	1.25
***************
*** 61,64 ****
--- 61,65 ----
  
  IF(Java_JAVA_EXECUTABLE)
+     set(_java_version_acceptable TRUE)
      EXECUTE_PROCESS(COMMAND ${Java_JAVA_EXECUTABLE} -version
        RESULT_VARIABLE res
***************
*** 72,82 ****
        # extract major/minor version and patch level from "java -version" output
        # Tested on linux using 
!       # 1. Sun
        # 2. OpenJDK 1.6
        # 3. GCJ 1.5
        # 4. Kaffe 1.4.2
!       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_]+).*"
                  "\\1" Java_VERSION_STRING "${var}" )
        ELSEIF(var MATCHES "java full version \"kaffe-[0-9]+\\.[0-9]+\\.[0-9_]+\".*")
--- 73,83 ----
        # extract major/minor version and patch level from "java -version" output
        # Tested on linux using 
!       # 1. Sun / Sun OEM
        # 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-]*\".*")
          # 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}" )
        ELSEIF(var MATCHES "java full version \"kaffe-[0-9]+\\.[0-9]+\\.[0-9_]+\".*")
***************
*** 86,90 ****
        ELSE()
          IF(NOT Java_FIND_QUIETLY)
!           message(STATUS "regex not supported: ${var}. Please report")
          ENDIF(NOT Java_FIND_QUIETLY)
        ENDIF()
--- 87,92 ----
        ELSE()
          IF(NOT Java_FIND_QUIETLY)
!           message(WARNING "regex not supported: ${var}. Please report")
!           set(_java_version_acceptable FALSE)
          ENDIF(NOT Java_FIND_QUIETLY)
        ENDIF()
***************
*** 107,111 ****
  
      # check version if requested:
-     set(_java_version_acceptable TRUE)
      if( Java_FIND_VERSION )
        if("${Java_VERSION}" VERSION_LESS "${Java_FIND_VERSION}")
--- 109,112 ----