kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace FATAL_ERROR with status. Remove output when QUIET is ON

Browse Source
This commit is contained in:
Mathieu Malaterre 2009-11-03 17:22:57 -05:00
parent b0d43475c6
commit b93b6dc677
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/FindJava.cmake
View File

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