From 51e2ab52afd3b6138d2d8f0b38b45d929cb6ccce Mon Sep 17 00:00:00 2001 From: Serge Gautherie Date: Mon, 24 May 2021 08:56:17 +0200 Subject: [PATCH] [CMAKE] msvc.cmake: Add arm64 CMAKE_ASM_MASM_COMPILER option support CORE-17518 --- sdk/cmake/msvc.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 42776e416ce..925fbe8c7fb 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -208,7 +208,7 @@ endif() # We don't put because this is handled in add_asm_files macro if (NOT MSVC_IDE) - if(ARCH STREQUAL "arm") + if(ARCH STREQUAL "arm" OR ARCH STREQUAL "arm64") set(CMAKE_ASM_MASM_COMPILE_OBJECT " -nologo -o ") else() set(CMAKE_ASM_MASM_COMPILE_OBJECT " /nologo /Cp /Fo /c /Ta ") @@ -324,7 +324,7 @@ function(generate_import_lib _libname _dllname _spec_file) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) # Compile the generated asm stub file - if(ARCH STREQUAL "arm") + if(ARCH STREQUAL "arm" OR ARCH STREQUAL "arm64") set(_asm_stub_command ${CMAKE_ASM_MASM_COMPILER} -nologo -o ${_asm_stubs_file}.obj ${_asm_stubs_file}) else() set(_asm_stub_command ${CMAKE_ASM_MASM_COMPILER} /nologo /Cp /Fo${_asm_stubs_file}.obj /c /Ta ${_asm_stubs_file})