cmake/zephyr: unify cmake rules for src/samples

Adding all source files in a single, giant zephyr/CMakeLists.txt is
inconvenient and does not scale.

Modify Zephyr rules to use definitions in src/samples/ instead.

Link: #8260
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>

Author: kv2019i

src/samples/audio/CMakeLists.txt

@@ -1,22 +1,22 @@
 # SPDX-License-Identifier: BSD-3-Clause
-if(CONFIG_SAMPLE_SMART_AMP)
-	if(CONFIG_IPC_MAJOR_3)
-		add_local_sources(sof
-			smart_amp_test_ipc3.c
-		)
-	elseif(CONFIG_IPC_MAJOR_4)
-		add_local_sources(sof
-			smart_amp_test_ipc4.c
-		)
-	endif()
+
+if(CONFIG_IPC_MAJOR_3)
+  set(ipc_suffix ipc3)
+elseif(CONFIG_IPC_MAJOR_4)
+  set(ipc_suffix ipc4)
+endif()
+
+if(CONFIG_SAMPLE_SMART_AMP STREQUAL "m")
+  add_subdirectory(smart_amp_test_llext ${PROJECT_BINARY_DIR}/smart_amp_test_llext)
+  add_dependencies(app smart_amp_test)
+elseif(CONFIG_SAMPLE_SMART_AMP)
+  add_local_sources(sof smart_amp_test_${ipc_suffix}.c)
 endif()
 
 if(CONFIG_SAMPLE_KEYPHRASE)
-	add_local_sources(sof
-		detect_test.c
-	)
+  add_local_sources(sof detect_test.c)
 endif()
 
 if(CONFIG_KWD_NN_SAMPLE_KEYPHRASE)
-	add_local_sources(sof kwd_nn_detect_test.c)
+  add_local_sources(sof kwd_nn_detect_test.c)
 endif()

zephyr/CMakeLists.txt

@@ -134,7 +134,6 @@ cmake_path(SET sof_top_dir NORMALIZE "${CMAKE_CURRENT_SOURCE_DIR}/..")
 set(SOF_SRC_PATH "${sof_top_dir}/src")
 
 set(SOF_PLATFORM_PATH "${SOF_SRC_PATH}/platform")
-set(SOF_SAMPLES_PATH "${SOF_SRC_PATH}/samples")
 set(SOF_DRIVERS_PATH "${SOF_SRC_PATH}/drivers")
 set(SOF_TRACE_PATH "${SOF_SRC_PATH}/trace")
 
@@ -211,6 +210,7 @@ add_subdirectory(../src/ipc/  ipc_unused_install/)
 add_subdirectory(../src/lib/ lib_unused_install/)
 add_subdirectory(../src/library_manager/ library_manager_unused_install/)
 add_subdirectory(../src/logging/ logging_unused_install/)
+add_subdirectory(../src/samples/ samples_unused_install/)
 add_subdirectory(../src/schedule/  schedule_unused_install/)
 add_subdirectory(../src/trace/ trace_unused_install/)
 add_subdirectory(test/)
@@ -481,26 +481,6 @@ zephyr_library_sources_ifdef(CONFIG_FAST_GET lib/fast-get.c)
 
 # Optional SOF sources - depends on Kconfig - WIP
 
-if(CONFIG_IPC_MAJOR_3)
-set(ipc_suffix ipc3)
-elseif(CONFIG_IPC_MAJOR_4)
-set(ipc_suffix ipc4)
-endif()
-
-zephyr_library_sources_ifdef(CONFIG_SAMPLE_KEYPHRASE
-	${SOF_SAMPLES_PATH}/audio/detect_test.c
-)
-
-if(CONFIG_SAMPLE_SMART_AMP STREQUAL "m")
-	add_subdirectory(${SOF_SAMPLES_PATH}/audio/smart_amp_test_llext
-			 ${PROJECT_BINARY_DIR}/smart_amp_test_llext)
-	add_dependencies(app smart_amp_test)
-elseif(CONFIG_SAMPLE_SMART_AMP)
-	zephyr_library_sources(
-		${SOF_SAMPLES_PATH}/audio/smart_amp_test_${ipc_suffix}.c
-	)
-endif()
-
 if(CONFIG_PROBE STREQUAL "m")
 	add_subdirectory(${SOF_SRC_PATH}/probe/llext
 			 ${PROJECT_BINARY_DIR}/probe_llext)