11set (SOF_TOPOLOGY_BINARY_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR} " )
2-
2+ set (SOF_ALSA_TOOLS_DIR "${SOF_ROOT_SOURCE_DIRECTORY} /../tools/bin" )
3+ set (ALSATPLG_CMD "${SOF_ALSA_TOOLS_DIR} /alsatplg" )
34
45function (alsatplg_version OUT_STATUS OUT_VERSION)
5- execute_process (COMMAND alsatplg --version
6+ execute_process (COMMAND ${ALSATPLG_CMD} --version
67 RESULT_VARIABLE status
78 OUTPUT_VARIABLE stdout
89 OUTPUT_STRIP_TRAILING_WHITESPACE)
9- message (DEBUG "alsatplg --version: status=${status} , output=${stdout} " )
10+ message (DEBUG "${ALSATPLG_CMD} --version: status=${status} , output=${stdout} " )
1011
1112 set (${OUT_STATUS} "${status} " PARENT_SCOPE)
1213
1314 # Some error messages have already been printed on stderr
1415 if (NOT status EQUAL 0)
15- message (WARNING "alsatplg --version returned status: ${status} ,
16+ message (WARNING "${ALSATPLG_CMD} --version returned status: ${status} ,
1617${stdout} " )
1718 return ()
1819 endif ()
@@ -32,7 +33,7 @@ endfunction()
3233# Longer story in #5192.
3334alsatplg_version(STATUS ALSATPLG_VERSION_NUMBER)
3435if (NOT STATUS EQUAL 0)
35- message (WARNING "alsatplg failed: ${STATUS} ; all topologies skipped" )
36+ message (WARNING "${ALSATPLG_CMD} failed: ${STATUS} ; all topologies skipped" )
3637 return ()
3738else ()
3839 if (${ALSATPLG_VERSION_NUMBER} VERSION_LESS "1.2.5" )
@@ -67,7 +68,7 @@ macro(add_alsatplg_command)
6768 # permissions are hardcoded and only the user can read
6869 # the -o(utput) file.
6970 # See bug https://github.com/alsa-project/alsa-utils/issues/126
70- COMMAND alsatplg \$\${VERBOSE:+-v 1} -c ${ARGV0} -o ${ARGV1}
71+ COMMAND ${ALSATPLG_CMD} \$\${VERBOSE:+-v 1} -c ${ARGV0} -o ${ARGV1}
7172 USES_TERMINAL
7273 )
7374endmacro ()
@@ -94,7 +95,7 @@ macro(add_alsatplg2_command conf_header conf_target input_name output_name inclu
9495 COMMAND cat ${conf_header} ${input_name} .conf > ${output_name} .conf
9596
9697 # -p to pre-process Topology2.0 conf file
97- COMMAND ALSA_CONFIG_DIR=${CMAKE_SOURCE_DIR} /topology/topology2 alsatplg \$\${VERBOSE:+-v 1}
98+ COMMAND ALSA_CONFIG_DIR=${CMAKE_SOURCE_DIR} /topology/topology2 ${ALSATPLG_CMD} \$\${VERBOSE:+-v 1}
9899 -I ${include_path} -D "'${defines} '" -p -c ${output_name} .conf -o ${output_name} .tplg
99100 USES_TERMINAL
100101 )
0 commit comments