[ros-diffs] [reactos] 01/01: [CMAKE] msvc.cmake: Add arm64 CMAKE_ASM_MASM_COMPILER option support

[Serge Gautherie]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=51e2ab52afd3b6138d2d8…

commit 51e2ab52afd3b6138d2d8f0b38b45d929cb6ccce
Author:     Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr>
AuthorDate: Mon May 24 08:56:17 2021 +0200
Commit:     Stanislav Motylkov <x86corez(a)gmail.com>
CommitDate: Mon Oct 11 15:24:30 2021 +0300

    [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 <INCLUDES> <DEFINES> <FLAGS> 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 "<CMAKE_ASM_MASM_COMPILER> -nologo
-o <OBJECT> <SOURCE>")
     else()
         set(CMAKE_ASM_MASM_COMPILE_OBJECT "<CMAKE_ASM_MASM_COMPILER> /nologo
/Cp /Fo <OBJECT> /c /Ta <SOURCE>")
@@ -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})