topology/cmake: move alsatplg_version() one level up

We want to use it in topology1 too. Signed-off-by: Marc Herbert <[email protected]>
kv2019i · Oct 24, 2023 · d9fb722 · d9fb722
1 parent f8a202a
commit d9fb722
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 24 deletions.
diff --git a/tools/topology/CMakeLists.txt b/tools/topology/CMakeLists.txt
@@ -1,5 +1,30 @@
 set(SOF_TOPOLOGY_BINARY_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
 
+
+function(alsatplg_version  OUT_STATUS  OUT_VERSION)
+	execute_process(COMMAND alsatplg --version
+	  RESULT_VARIABLE status
+	  OUTPUT_VARIABLE stdout
+	  OUTPUT_STRIP_TRAILING_WHITESPACE)
+	message(DEBUG "alsatplg --version: status=${status}, output=${stdout}")
+
+	set(${OUT_STATUS} "${status}" PARENT_SCOPE)
+
+        # Some error messages have already been printed on stderr
+	if(NOT status EQUAL 0)
+	  message(WARNING "alsatplg --version returned status: ${status},
+${stdout}")
+	  return()
+	endif()
+
+	string(REPLACE "\n" ";" ALSA_VERSION_LIST ${stdout})
+	list(GET ALSA_VERSION_LIST 0 ALSATPLG_VERSION)
+	string(REGEX MATCH "[0-9]\.[0-9]\.*[0-9]*" ALSATPLG_VERSION_NUMBER ${ALSATPLG_VERSION})
+
+	set(${OUT_VERSION} "${ALSATPLG_VERSION_NUMBER}" PARENT_SCOPE)
+endfunction()
+
+
 # This use of VERBOSE relies on original CMake behavior.
 # From the add_custom_command() manual:
 #

diff --git a/tools/topology/topology2/CMakeLists.txt b/tools/topology/topology2/CMakeLists.txt
@@ -3,30 +3,6 @@ add_custom_target(topologies2)
 
 # Check alsatplg version and build topology2 if alsatplg version is
 # 1.2.7 or greater, see https://github.com/thesofproject/sof/issues/5323
-
-function(alsatplg_version  OUT_STATUS  OUT_VERSION)
-	execute_process(COMMAND alsatplg --version
-	  RESULT_VARIABLE status
-	  OUTPUT_VARIABLE stdout
-	  OUTPUT_STRIP_TRAILING_WHITESPACE)
-	message(DEBUG "alsatplg --version: status=${status}, output=${stdout}")
-
-	set(${OUT_STATUS} "${status}" PARENT_SCOPE)
-
-        # Some error messages have already been printed on stderr
-	if(NOT status EQUAL 0)
-	  message(WARNING "alsatplg --version returned status: ${status},
-${stdout}")
-	  return()
-	endif()
-
-	string(REPLACE "\n" ";" ALSA_VERSION_LIST ${stdout})
-	list(GET ALSA_VERSION_LIST 0 ALSATPLG_VERSION)
-	string(REGEX MATCH "[0-9]\.[0-9]\.*[0-9]*" ALSATPLG_VERSION_NUMBER ${ALSATPLG_VERSION})
-
-	set(${OUT_VERSION} "${ALSATPLG_VERSION_NUMBER}" PARENT_SCOPE)
-endfunction()
-
 alsatplg_version(STATUS ALSATPLG_VERSION_NUMBER)
 
 if(NOT STATUS EQUAL 0)