CMake fix for DEEP_PLC

1 files changed, 24 insertions, 14 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f6ebc22..06e9b675 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -382,26 +382,26 @@ if(NOT OPUS_ENABLE_FLOAT_API)
   target_compile_definitions(opus PRIVATE DISABLE_FLOAT_API)
 endif()
 
-if (OPUS_DEEP_PLC)
+if (OPUS_DEEP_PLC OR OPUS_DRED OR OPUS_OSCE)
   add_sources_group(opus lpcnet ${deep_plc_headers} ${deep_plc_sources})
+  set(OPUS_DNN TRUE)
+else()
+  set(OPUS_DNN FALSE)
+endif()
+
+if (OPUS_DNN)
+  add_sources_group(opus lpcnet ${deep_plc_headers} ${deep_plc_sources})
+  target_compile_definitions(opus PRIVATE ENABLE_DEEP_PLC)
 endif()
 
 if (OPUS_DRED)
   add_sources_group(opus lpcnet ${dred_headers} ${dred_sources})
   target_compile_definitions(opus PRIVATE ENABLE_DRED)
-  if(NOT OPUS_DEEP_PLC)
-    target_compile_definitions(opus PRIVATE ENABLE_DEEP_PLC)
-    add_sources_group(opus lpcnet ${deep_plc_headers} ${deep_plc_sources})
-  endif()
 endif()
 
 if (OPUS_OSCE)
   add_sources_group(opus lpcnet ${osce_headers} ${osce_sources})
   target_compile_definitions(opus PRIVATE ENABLE_OSCE)
-  if(NOT OPUS_DEEP_PLC)
-    target_compile_definitions(opus PRIVATE ENABLE_DEEP_PLC)
-    add_sources_group(opus lpcnet ${deep_plc_headers} ${deep_plc_sources})
-  endif()
 endif()
 
 if(NOT OPUS_DISABLE_INTRINSICS)
@@ -422,7 +422,9 @@ if(NOT OPUS_DISABLE_INTRINSICS)
     endif()
     add_sources_group(opus celt ${celt_sources_x86_rtcd})
     add_sources_group(opus silk ${silk_sources_x86_rtcd})
-    add_sources_group(opus lpcnet ${dnn_sources_x86_rtcd})
+    if (OPUS_DNN)
+      add_sources_group(opus lpcnet ${dnn_sources_x86_rtcd})
+    endif()
   endif()
 
   if(SSE1_SUPPORTED)
@@ -444,7 +446,9 @@ if(NOT OPUS_DISABLE_INTRINSICS)
   if(SSE2_SUPPORTED)
     if(OPUS_X86_MAY_HAVE_SSE2)
       add_sources_group(opus celt ${celt_sources_sse2})
-      add_sources_group(opus lpcnet ${dnn_sources_sse2})
+      if (OPUS_DNN)
+        add_sources_group(opus lpcnet ${dnn_sources_sse2})
+      endif()
       target_compile_definitions(opus PRIVATE OPUS_X86_MAY_HAVE_SSE2)
       if(NOT MSVC)
         set_source_files_properties(${celt_sources_sse2} ${dnn_sources_sse2} PROPERTIES COMPILE_FLAGS -msse2)
@@ -462,7 +466,9 @@ if(NOT OPUS_DISABLE_INTRINSICS)
     if(OPUS_X86_MAY_HAVE_SSE4_1)
       add_sources_group(opus celt ${celt_sources_sse4_1})
       add_sources_group(opus silk ${silk_sources_sse4_1})
-      add_sources_group(opus lpcnet ${dnn_sources_sse4_1})
+      if (OPUS_DNN)
+        add_sources_group(opus lpcnet ${dnn_sources_sse4_1})
+      endif()
       target_compile_definitions(opus PRIVATE OPUS_X86_MAY_HAVE_SSE4_1)
       if(NOT MSVC)
         set_source_files_properties(${celt_sources_sse4_1} ${silk_sources_sse4_1} ${dnn_sources_sse4_1} PROPERTIES COMPILE_FLAGS -msse4.1)
@@ -488,7 +494,9 @@ if(NOT OPUS_DISABLE_INTRINSICS)
       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})
-      add_sources_group(opus lpcnet ${dnn_sources_avx2})
+      if (OPUS_DNN)
+        add_sources_group(opus lpcnet ${dnn_sources_avx2})
+      endif()
       target_compile_definitions(opus PRIVATE OPUS_X86_MAY_HAVE_AVX2)
       if(MSVC)
         set(AVX2_FLAGS "${AVX2_FLAGS} /arch:AVX2")
@@ -541,7 +549,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})
-    add_sources_group(opus lpcnet ${dnn_sources_arm_neon})
+    if (OPUS_DNN)
+      add_sources_group(opus lpcnet ${dnn_sources_arm_neon})
+    endif()
 
     # silk arm neon depends on main_Fix.h
     target_include_directories(opus PRIVATE silk/fixed)