From 2554a89e02c7fc30a980b4f7e635ceae1ecba5d6 Mon Sep 17 00:00:00 2001 From: Blaine Wood <blaine@peaksound.works> Date: Wed, 22 May 2024 12:14:22 -0600 Subject: [PATCH] Fixing Cmake error for OPUS_FIXED_POINT=ON Only include floating point inner product when OPUS_FIXED_POINT is disabled. Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca> --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8535ad5f3..eff161ca9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -507,7 +507,9 @@ if(NOT OPUS_DISABLE_INTRINSICS) if(OPUS_X86_MAY_HAVE_AVX2) add_sources_group(opus celt ${celt_sources_avx2}) add_sources_group(opus silk ${silk_sources_avx2}) - add_sources_group(opus silk ${silk_sources_float_avx2}) + if (NOT OPUS_FIXED_POINT) + add_sources_group(opus silk ${silk_sources_float_avx2}) + endif() if (OPUS_DNN) add_sources_group(opus lpcnet ${dnn_sources_avx2}) endif() @@ -519,7 +521,9 @@ if(NOT OPUS_DISABLE_INTRINSICS) endif() set_source_files_properties(${celt_sources_avx2} PROPERTIES COMPILE_FLAGS ${AVX2_FLAGS}) set_source_files_properties(${silk_sources_avx2} PROPERTIES COMPILE_FLAGS ${AVX2_FLAGS}) - set_source_files_properties(${silk_sources_float_avx2} PROPERTIES COMPILE_FLAGS ${AVX2_FLAGS}) + if (NOT OPUS_FIXED_POINT) + set_source_files_properties(${silk_sources_float_avx2} PROPERTIES COMPILE_FLAGS ${AVX2_FLAGS}) + endif() set_source_files_properties(${dnn_sources_avx2} PROPERTIES COMPILE_FLAGS ${AVX2_FLAGS}) endif() if(OPUS_X86_PRESUME_AVX2) -- GitLab