Browse Source

Replace FATAL_ERROR with status. Remove output when QUIET is ON

Mathieu Malaterre 16 years ago
parent
commit
b93b6dc677
1 changed files with 6 additions and 2 deletions
  1. 6 2
      Modules/FindJava.cmake

+ 6 - 2
Modules/FindJava.cmake

@@ -84,7 +84,9 @@ IF(Java_JAVA_EXECUTABLE)
         STRING( REGEX REPLACE "java full version \"kaffe-([0-9]+\\.[0-9]+\\.[0-9_]+).*"
                 "\\1" Java_VERSION_STRING "${var}" )
       ELSE()
-        message(FATAL_ERROR "regex not supported: ${var}. Please report")
+        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}" )
       STRING( REGEX REPLACE "[0-9]+\\.([0-9]+).*" "\\1" Java_VERSION_MINOR "${Java_VERSION_STRING}" )
@@ -98,7 +100,9 @@ IF(Java_JAVA_EXECUTABLE)
       endif( )
       # display info
       #MESSAGE( STATUS "Java version ${Java_VERSION_STRING} configured successfully!" ) # keep me, used for debug
-      MESSAGE( STATUS "Java version ${Java_VERSION} configured successfully!" )
+      IF(NOT Java_FIND_QUIETLY)
+        MESSAGE( STATUS "Java version ${Java_VERSION} configured successfully!" )
+      ENDIF(NOT Java_FIND_QUIETLY)
     ENDIF()
 
     # check version if requested: