Log java versions in both PATH and under JAVA_HOME

This commit is contained in:
baldurk
2020-01-27 20:45:08 +00:00
parent 4e53297535
commit 560a9669f2
2 changed files with 14 additions and 0 deletions
+13
View File
@@ -7,6 +7,19 @@ if(BUILD_ANDROID)
endif()
message(STATUS "Using JAVA_HOME = $ENV{JAVA_HOME}")
execute_process(COMMAND $ENV{JAVA_HOME}/bin/java -version
RESULT_VARIABLE _result
OUTPUT_VARIABLE _output
ERROR_VARIABLE _output
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_STRIP_TRAILING_WHITESPACE)
if(NOT _result AND _output MATCHES "version \"([0-9]+).([0-9]+)")
message(STATUS "Java in JAVA_HOME is ${CMAKE_MATCH_1}.${CMAKE_MATCH_2}")
else()
message(STATUS "Java in JAVA_HOME is unknown version ${_output} ${_result}")
endif()
if(DEFINED ENV{ANDROID_HOME} AND EXISTS "$ENV{ANDROID_HOME}/build-tools")
set(ANDROID_SDK_ROOT_PATH "$ENV{ANDROID_HOME}")
elseif(DEFINED ENV{ANDROID_SDK_ROOT} AND EXISTS "$ENV{ANDROID_SDK_ROOT}/build-tools")
+1
View File
@@ -73,6 +73,7 @@ if(ANDROID)
if(${Java_VERSION} VERSION_LESS 1.8)
message(FATAL_ERROR "Building Android requires the 'java' program in your PATH to be at least Java 8 (1.8)")
endif()
message(STATUS "Using Java of version ${Java_VERSION}")
if(STRIP_ANDROID_LIBRARY AND CMAKE_STRIP AND CMAKE_BUILD_TYPE STREQUAL "Release")
add_custom_command(TARGET renderdoccmd POST_BUILD