|
@@ -143,7 +143,7 @@ ELSEIF(JDK_VERSION == "16")
|
|
ELSEIF(OS_WINDOWS)
|
|
ELSEIF(OS_WINDOWS)
|
|
DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK16_WINDOWS})
|
|
DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK16_WINDOWS})
|
|
ENDIF()
|
|
ENDIF()
|
|
-ELSEIF(JDK_VERSION == "15")
|
|
|
|
|
|
+ELSEIF(JDK_VERSION == "15")
|
|
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
|
|
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
|
|
JDK
|
|
JDK
|
|
${JDK15_DARWIN} FOR DARWIN
|
|
${JDK15_DARWIN} FOR DARWIN
|
|
@@ -164,7 +164,7 @@ ELSEIF(JDK_VERSION == "15")
|
|
ELSEIF(OS_WINDOWS)
|
|
ELSEIF(OS_WINDOWS)
|
|
DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK15_WINDOWS})
|
|
DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK15_WINDOWS})
|
|
ENDIF()
|
|
ENDIF()
|
|
-ELSEIF(JDK_VERSION == "14")
|
|
|
|
|
|
+ELSEIF(JDK_VERSION == "14")
|
|
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
|
|
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
|
|
JDK
|
|
JDK
|
|
${JDK14_DARWIN} FOR DARWIN
|
|
${JDK14_DARWIN} FOR DARWIN
|
|
@@ -182,7 +182,7 @@ ELSEIF(JDK_VERSION == "14")
|
|
ELSEIF(OS_WINDOWS)
|
|
ELSEIF(OS_WINDOWS)
|
|
DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK14_WINDOWS})
|
|
DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK14_WINDOWS})
|
|
ENDIF()
|
|
ENDIF()
|
|
-ELSEIF(JDK_VERSION == "13")
|
|
|
|
|
|
+ELSEIF(JDK_VERSION == "13")
|
|
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
|
|
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
|
|
JDK
|
|
JDK
|
|
${JDK13_DARWIN} FOR DARWIN
|
|
${JDK13_DARWIN} FOR DARWIN
|
|
@@ -192,7 +192,7 @@ ELSEIF(JDK_VERSION == "13")
|
|
IF(NOT HOST_OS_LINUX AND NOT HOST_OS_WINDOWS AND NOT HOST_OS_DARWIN)
|
|
IF(NOT HOST_OS_LINUX AND NOT HOST_OS_WINDOWS AND NOT HOST_OS_DARWIN)
|
|
MESSAGE(FATAL_ERROR Unsupported platform for JDK13)
|
|
MESSAGE(FATAL_ERROR Unsupported platform for JDK13)
|
|
ENDIF()
|
|
ENDIF()
|
|
- IF(SANITIZER_TYPE == "address")
|
|
|
|
|
|
+ IF(SANITIZER_TYPE == "address")
|
|
IF(HOST_OS_LINUX)
|
|
IF(HOST_OS_LINUX)
|
|
DECLARE_EXTERNAL_RESOURCE(JDK_FOR_TESTS ${JDK13_LINUX_ASAN})
|
|
DECLARE_EXTERNAL_RESOURCE(JDK_FOR_TESTS ${JDK13_LINUX_ASAN})
|
|
ELSE()
|
|
ELSE()
|
|
@@ -207,7 +207,7 @@ ELSEIF(JDK_VERSION == "13")
|
|
ELSEIF(OS_WINDOWS)
|
|
ELSEIF(OS_WINDOWS)
|
|
DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK13_WINDOWS})
|
|
DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK13_WINDOWS})
|
|
ENDIF()
|
|
ENDIF()
|
|
-ELSEIF(JDK_VERSION == "12")
|
|
|
|
|
|
+ELSEIF(JDK_VERSION == "12")
|
|
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
|
|
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
|
|
JDK
|
|
JDK
|
|
${JDK12_DARWIN} FOR DARWIN
|
|
${JDK12_DARWIN} FOR DARWIN
|
|
@@ -225,7 +225,7 @@ ELSEIF(JDK_VERSION == "12")
|
|
ELSEIF(OS_WINDOWS)
|
|
ELSEIF(OS_WINDOWS)
|
|
DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK12_WINDOWS})
|
|
DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK12_WINDOWS})
|
|
ENDIF()
|
|
ENDIF()
|
|
-ELSEIF(JDK_VERSION == "11")
|
|
|
|
|
|
+ELSEIF(JDK_VERSION == "11")
|
|
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
|
|
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
|
|
JDK
|
|
JDK
|
|
${JDK11_DARWIN} FOR DARWIN
|
|
${JDK11_DARWIN} FOR DARWIN
|
|
@@ -236,7 +236,7 @@ ELSEIF(JDK_VERSION == "11")
|
|
IF(NOT HOST_OS_LINUX AND NOT HOST_OS_WINDOWS AND NOT HOST_OS_DARWIN)
|
|
IF(NOT HOST_OS_LINUX AND NOT HOST_OS_WINDOWS AND NOT HOST_OS_DARWIN)
|
|
MESSAGE(FATAL_ERROR Unsupported platform for JDK11)
|
|
MESSAGE(FATAL_ERROR Unsupported platform for JDK11)
|
|
ENDIF()
|
|
ENDIF()
|
|
- IF(SANITIZER_TYPE == "address")
|
|
|
|
|
|
+ IF(SANITIZER_TYPE == "address")
|
|
IF(HOST_OS_LINUX)
|
|
IF(HOST_OS_LINUX)
|
|
DECLARE_EXTERNAL_RESOURCE(JDK_FOR_TESTS ${JDK11_LINUX_ASAN})
|
|
DECLARE_EXTERNAL_RESOURCE(JDK_FOR_TESTS ${JDK11_LINUX_ASAN})
|
|
ELSE()
|
|
ELSE()
|
|
@@ -253,7 +253,7 @@ ELSEIF(JDK_VERSION == "11")
|
|
ELSEIF(OS_WINDOWS)
|
|
ELSEIF(OS_WINDOWS)
|
|
DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK11_WINDOWS})
|
|
DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK11_WINDOWS})
|
|
ENDIF()
|
|
ENDIF()
|
|
-ELSEIF(JDK_VERSION == "10")
|
|
|
|
|
|
+ELSEIF(JDK_VERSION == "10")
|
|
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
|
|
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
|
|
JDK
|
|
JDK
|
|
${JDK10_DARWIN} FOR DARWIN
|
|
${JDK10_DARWIN} FOR DARWIN
|
|
@@ -271,7 +271,7 @@ ELSEIF(JDK_VERSION == "10")
|
|
ELSEIF(OS_WINDOWS)
|
|
ELSEIF(OS_WINDOWS)
|
|
DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK10_WINDOWS})
|
|
DECLARE_EXTERNAL_RESOURCE(WITH_JDK ${JDK10_WINDOWS})
|
|
ENDIF()
|
|
ENDIF()
|
|
-ELSEIF(JDK_VERSION == "8")
|
|
|
|
|
|
+ELSEIF(JDK_VERSION == "8")
|
|
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
|
|
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
|
|
JDK
|
|
JDK
|
|
${JDK8_DARWIN_ARM64} FOR DARWIN-ARM64
|
|
${JDK8_DARWIN_ARM64} FOR DARWIN-ARM64
|