ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/urho3d/asm_files.patch

   1 diff --git a/Source/ThirdParty/AngelScript/CMakeLists.txt b/Source/ThirdParty/AngelScript/CMakeLists.txt
   2 index 6709cf5fc..4842f20b1 100644
   3 --- a/Source/ThirdParty/AngelScript/CMakeLists.txt
   4 +++ b/Source/ThirdParty/AngelScript/CMakeLists.txt
   5 @@ -44,10 +44,10 @@ if (ARM)
   6  elseif (MSVC AND URHO3D_64BIT)
   7      enable_language (ASM_MASM)
   8      # Commented out due to cmake bug - todo: Recheck if this workaround is still necessary when increasing CMake minimum version
   9 -    #set (ASM_FILES source/as_callfunc_x64_msvc_asm.asm)
  10 +    set (ASM_FILES source/as_callfunc_x64_msvc_asm.asm)
  11      # As a temporary workaround
  12 -    add_custom_command (OUTPUT as_callfunc_x64_msvc_asm.obj COMMAND ${CMAKE_ASM_MASM_COMPILER} -Fo ${CMAKE_CURRENT_BINARY_DIR}/as_callfunc_x64_msvc_asm.obj -c ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm COMMENT "Temporary workaround for MASM")
  13 -    set (ASM_FILES ${CMAKE_CURRENT_BINARY_DIR}/as_callfunc_x64_msvc_asm.obj ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm)
  14 +    #add_custom_command (OUTPUT as_callfunc_x64_msvc_asm.obj COMMAND ${CMAKE_ASM_MASM_COMPILER} -Fo ${CMAKE_CURRENT_BINARY_DIR}/as_callfunc_x64_msvc_asm.obj -c ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm COMMENT "Temporary workaround for MASM")
  15 +    #set (ASM_FILES ${CMAKE_CURRENT_BINARY_DIR}/as_callfunc_x64_msvc_asm.obj ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm)
  16  endif ()
  17  list (APPEND SOURCE_FILES ${ASM_FILES})
  18
  19 diff --git a/Source/ThirdParty/LibCpuId/CMakeLists.txt b/Source/ThirdParty/LibCpuId/CMakeLists.txt
  20 index 0aecafb06..677fd4b84 100644
  21 --- a/Source/ThirdParty/LibCpuId/CMakeLists.txt
  22 +++ b/Source/ThirdParty/LibCpuId/CMakeLists.txt
  23 @@ -33,10 +33,10 @@ endif ()
  24  if (MSVC AND URHO3D_64BIT)
  25      enable_language (ASM_MASM)
  26      # Commented out due to cmake bug
  27 -    #set (ASM_FILES src/masm-x64.asm)
  28 +    set (ASM_FILES src/masm-x64.asm)
  29      # As a temporary workaround
  30 -    add_custom_command (OUTPUT masm-x64.obj COMMAND ${CMAKE_ASM_MASM_COMPILER} -Fo ${CMAKE_CURRENT_BINARY_DIR}/masm-x64.obj -c ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm COMMENT "Temporary workaround for MASM")
  31 -    set (ASM_FILES ${CMAKE_CURRENT_BINARY_DIR}/masm-x64.obj ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm)
  32 +    #add_custom_command (OUTPUT masm-x64.obj COMMAND ${CMAKE_ASM_MASM_COMPILER} -Fo ${CMAKE_CURRENT_BINARY_DIR}/masm-x64.obj -c ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm COMMENT "Temporary workaround for MASM")
  33 +    #set (ASM_FILES ${CMAKE_CURRENT_BINARY_DIR}/masm-x64.obj ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm)
  34  endif ()
  35
  36  # Define source files