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

[cmake-commits at cmake.org]

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

Modified Files:
	FindJava.cmake 
Log Message:
Replace FATAL_ERROR with status. Remove output when QUIET is ON


Index: FindJava.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJava.cmake,v
retrieving revision 1.23
retrieving revision 1.24
diff -C 2 -d -r1.23 -r1.24
*** FindJava.cmake	2 Nov 2009 16:37:16 -0000	1.23
--- FindJava.cmake	3 Nov 2009 22:22:57 -0000	1.24
***************
*** 85,89 ****
                  "\\1" Java_VERSION_STRING "${var}" )
        ELSE()
!         message(FATAL_ERROR "regex not supported: ${var}. Please report")
        ENDIF()
        STRING( REGEX REPLACE "([0-9]+).*" "\\1" Java_VERSION_MAJOR "${Java_VERSION_STRING}" )
--- 85,91 ----
                  "\\1" Java_VERSION_STRING "${var}" )
        ELSE()
!         IF(NOT Java_FIND_QUIETLY)
!           message(STATUS "regex not supported: ${var}. Please report")
!         ENDIF(NOT Java_FIND_QUIETLY)
        ENDIF()
        STRING( REGEX REPLACE "([0-9]+).*" "\\1" Java_VERSION_MAJOR "${Java_VERSION_STRING}" )
***************
*** 99,103 ****
        # display info
        #MESSAGE( STATUS "Java version ${Java_VERSION_STRING} configured successfully!" ) # keep me, used for debug
!       MESSAGE( STATUS "Java version ${Java_VERSION} configured successfully!" )
      ENDIF()
  
--- 101,107 ----
        # display info
        #MESSAGE( STATUS "Java version ${Java_VERSION_STRING} configured successfully!" ) # keep me, used for debug
!       IF(NOT Java_FIND_QUIETLY)
!         MESSAGE( STATUS "Java version ${Java_VERSION} configured successfully!" )
!       ENDIF(NOT Java_FIND_QUIETLY)
      ENDIF()