|
|
@@ -221,7 +221,7 @@ if(Java_JAVA_EXECUTABLE)
|
|
|
unset(_java_var)
|
|
|
set(Java_VERSION "${Java_VERSION_MAJOR}")
|
|
|
if(NOT "x${Java_VERSION}" STREQUAL "x")
|
|
|
- foreach(_java_c MINOR PATCH TWEAK)
|
|
|
+ foreach(_java_c IN ITEMS "MINOR" "PATCH" "TWEAK")
|
|
|
if(NOT "x${Java_VERSION_${_java_c}}" STREQUAL "x")
|
|
|
string(APPEND Java_VERSION ".${Java_VERSION_${_java_c}}")
|
|
|
else()
|
|
|
@@ -274,7 +274,7 @@ find_program(Java_JARSIGNER_EXECUTABLE
|
|
|
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
|
|
|
if(Java_FIND_COMPONENTS)
|
|
|
set(_JAVA_REQUIRED_VARS)
|
|
|
- foreach(component ${Java_FIND_COMPONENTS})
|
|
|
+ foreach(component IN LISTS Java_FIND_COMPONENTS)
|
|
|
# User just want to execute some Java byte-compiled
|
|
|
If(component STREQUAL "Runtime")
|
|
|
list(APPEND _JAVA_REQUIRED_VARS Java_JAVA_EXECUTABLE)
|
|
|
@@ -316,7 +316,7 @@ if(Java_FIND_COMPONENTS)
|
|
|
VERSION_VAR Java_VERSION
|
|
|
)
|
|
|
if(Java_FOUND)
|
|
|
- foreach(component ${Java_FIND_COMPONENTS})
|
|
|
+ foreach(component IN LISTS Java_FIND_COMPONENTS)
|
|
|
set(Java_${component}_FOUND TRUE)
|
|
|
endforeach()
|
|
|
endif()
|
scivision