From 91ed84cc5b28c61ba0b9e22a0577c816b35a1889 Mon Sep 17 00:00:00 2001 From: Vladislav Rassokhin Date: Mon, 5 Sep 2022 14:11:21 +0200 Subject: [PATCH] IDEA-296416 breakgen: build for ARM64, fix artifact name GitOrigin-RevId: 004b6e6fb688ceb28ad1061331f867dfd2acb3c8 --- native/breakgen/CMakeLists.txt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/native/breakgen/CMakeLists.txt b/native/breakgen/CMakeLists.txt index 3be57f64364f..c3cb6b0eb2c5 100644 --- a/native/breakgen/CMakeLists.txt +++ b/native/breakgen/CMakeLists.txt @@ -8,20 +8,24 @@ endif () set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT") +check_symbol_exists("_M_ARM64" "" TARGET_ARM64) check_symbol_exists("_M_AMD64" "" TARGET_X64) -if (TARGET_X64) +if (TARGET_ARM64) + set(FILE_NAME "breakgen64a") + set(JAVA_HOME $ENV{JDK_11_0_ARM64}) +elseif (TARGET_X64) set(FILE_NAME "breakgen64") - set(JAVA_HOME $ENV{JDK_18_x64}) + set(JAVA_HOME $ENV{JDK_11_0_x64}) else () set(FILE_NAME "breakgen") - set(JAVA_HOME $ENV{JDK_18}) + set(JAVA_HOME $ENV{JDK_11_0}) endif () if (NOT JAVA_HOME) - message(FATAL_ERROR "JDK_18/JDK_18_x64 variables not defined (x64=${TARGET_X64}).") + message(FATAL_ERROR "JDK_11_0/JDK_11_0_x64/JDK_11_0_ARM64 variables not defined (x64=${TARGET_X64}, arm64=${TARGET_ARM64}).") endif () include_directories(${JAVA_HOME}/include ${JAVA_HOME}/include/win32) add_library(breakgen SHARED AppMain.c) -set_target_properties(breakgen PROPERTIES OUTPUT_NAME FILE_NAME) +set_target_properties(breakgen PROPERTIES OUTPUT_NAME ${FILE_NAME})