Skip to content

[fix] CMake linker failure on ARM when DNN is disabled and NEON uses RTCD #478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
uilianries wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −2
Open

[fix] CMake linker failure on ARM when DNN is disabled and NEON uses RTCD #478

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,10 @@ if(NOT OPUS_DISABLE_INTRINSICS)
target_compile_definitions(opus PRIVATE OPUS_HAVE_RTCD)
add_sources_group(opus celt ${celt_sources_arm_rtcd})
add_sources_group(opus silk ${silk_sources_arm_rtcd})
add_sources_group(opus lpcnet ${dnn_sources_arm_rtcd})
if(OPUS_DNN)
add_sources_group(opus lpcnet ${dnn_sources_arm_rtcd})
add_sources_group(opus lpcnet ${dnn_sources_arm_neon})
endif()
else()
message(ERROR "Runtime cpu capability detection needed for MAY_HAVE_NEON")
endif()
Expand All @@ -576,7 +579,9 @@ if(NOT OPUS_DISABLE_INTRINSICS)

add_sources_group(opus celt ${celt_sources_arm_neon_intr})
add_sources_group(opus silk ${silk_sources_arm_neon_intr})
if (OPUS_DNN)
if(OPUS_DNN AND NOT OPUS_MAY_HAVE_NEON)
# When NEON is presumed (no RTCD), add nnet_neon directly.
# When MAY_HAVE_NEON (RTCD), nnet_neon is already added in the block above.
add_sources_group(opus lpcnet ${dnn_sources_arm_neon})
endif()

Expand Down