aom_ports.cmake: don't add x86_abi_support.asm to source list x2 this avoids compilation failures when projects enable ASM language support in project(). this file was never included in libaom_srcs.* aom & aom_static were missed in the removal from aom_ports in: 676f00c61 aom_ports.cmake: don't add x86_abi_support.asm to source list Bug: aomedia:3201 Change-Id: Id26e7a02955eab43c83ca26bd414fe34d4b34e50 (cherry picked from commit 8cba6495dd1bb9cbd59f96548583779eb6bcb2dc)
diff --git a/aom_ports/aom_ports.cmake b/aom_ports/aom_ports.cmake index 5e553ae..b4cceb7 100644 --- a/aom_ports/aom_ports.cmake +++ b/aom_ports/aom_ports.cmake
@@ -61,12 +61,12 @@ endif() endif() + # Note AOM_PORTS_INCLUDES_X86 are not added to the aom_ports, aom or + # aom_static targets to avoid compilation issues in projects that enable ASM + # language support in project(). These sources were never included in + # libaom_srcs.*; if it becomes necessary for a particular generator another + # method should be used. if(aom_ports_has_symbols) - # Note AOM_PORTS_INCLUDES_X86 are not added to the aom_ports target to avoid - # compilation issues in projects that enable ASM language support in - # project(). These sources were never included in libaom_srcs.*; if it - # becomes necessary for a particular generator another method should be - # used. target_sources(aom_ports PRIVATE ${AOM_PORTS_INCLUDES}) set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} PARENT_SCOPE) else() @@ -74,13 +74,5 @@ if(BUILD_SHARED_LIBS) target_sources(aom_static PRIVATE ${AOM_PORTS_INCLUDES}) endif() - - if("${AOM_TARGET_CPU}" STREQUAL "x86" - OR "${AOM_TARGET_CPU}" STREQUAL "x86_64") - target_sources(aom PRIVATE ${AOM_PORTS_INCLUDES_X86}) - if(BUILD_SHARED_LIBS) - target_sources(aom_static PRIVATE ${AOM_PORTS_INCLUDES_X86}) - endif() - endif() endif() endfunction()