From e704e879dfdea638eac5c7226117a7bb63174071 Mon Sep 17 00:00:00 2001 From: "deng.weiwei" Date: Tue, 6 Feb 2024 18:37:56 +0800 Subject: [PATCH] portaudio:fix compile error --- port/freebsd-netgraph/CMakeLists.txt | 6 +++--- port/libusb/CMakeLists.txt | 6 +++--- port/posix-h4-bcm/CMakeLists.txt | 6 +++--- port/posix-h4-nxp/CMakeLists.txt | 6 +++--- port/posix-h4-zephyr/CMakeLists.txt | 6 +++--- port/posix-h4/CMakeLists.txt | 6 +++--- port/windows-h4-da14585/CMakeLists.txt | 6 +++--- port/windows-h4-zephyr/CMakeLists.txt | 6 +++--- port/windows-h4/CMakeLists.txt | 6 +++--- port/windows-winusb-intel/CMakeLists.txt | 6 +++--- port/windows-winusb/CMakeLists.txt | 6 +++--- test/avdtp/CMakeLists.txt | 6 +++--- test/le_audio/CMakeLists.txt | 6 +++--- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/port/freebsd-netgraph/CMakeLists.txt b/port/freebsd-netgraph/CMakeLists.txt index 67b3fd0585..6c3b8e2ebe 100644 --- a/port/freebsd-netgraph/CMakeLists.txt +++ b/port/freebsd-netgraph/CMakeLists.txt @@ -148,9 +148,6 @@ set(SOURCES ) list(SORT SOURCES) -# create static lib -add_library(btstack STATIC ${SOURCES}) - # pkgconfig find_package(PkgConfig) @@ -166,6 +163,9 @@ if (PkgConfig_FOUND) endif() endif() +# create static lib +add_library(btstack STATIC ${SOURCES}) + # pthread find_package(Threads) link_libraries(${CMAKE_THREAD_LIBS_INIT}) diff --git a/port/libusb/CMakeLists.txt b/port/libusb/CMakeLists.txt index b31f742307..0f868ec3f4 100644 --- a/port/libusb/CMakeLists.txt +++ b/port/libusb/CMakeLists.txt @@ -135,9 +135,6 @@ set(SOURCES ) list(SORT SOURCES) -# create static lib -add_library(btstack STATIC ${SOURCES}) - # pkgconfig required to link libusb find_package(PkgConfig REQUIRED) @@ -157,6 +154,9 @@ if(PORTAUDIO_FOUND) add_compile_definitions(HAVE_PORTAUDIO) endif() +# create static lib +add_library(btstack STATIC ${SOURCES}) + # pthread find_package(Threads) link_libraries(${CMAKE_THREAD_LIBS_INIT}) diff --git a/port/posix-h4-bcm/CMakeLists.txt b/port/posix-h4-bcm/CMakeLists.txt index c1eced1bf0..70de8df6be 100644 --- a/port/posix-h4-bcm/CMakeLists.txt +++ b/port/posix-h4-bcm/CMakeLists.txt @@ -126,9 +126,6 @@ set(SOURCES ) list(SORT SOURCES) -# create static lib -add_library(btstack STATIC ${SOURCES}) - # pkgconfig find_package(PkgConfig) @@ -144,6 +141,9 @@ if (PkgConfig_FOUND) endif() endif() +# create static lib +add_library(btstack STATIC ${SOURCES}) + # pthread find_package(Threads) link_libraries(${CMAKE_THREAD_LIBS_INIT}) diff --git a/port/posix-h4-nxp/CMakeLists.txt b/port/posix-h4-nxp/CMakeLists.txt index 8d7fc249e7..86c1857903 100644 --- a/port/posix-h4-nxp/CMakeLists.txt +++ b/port/posix-h4-nxp/CMakeLists.txt @@ -126,9 +126,6 @@ set(SOURCES ) list(SORT SOURCES) -# create static lib -add_library(btstack STATIC ${SOURCES}) - # pkgconfig find_package(PkgConfig) @@ -144,6 +141,9 @@ if (PkgConfig_FOUND) endif() endif() +# create static lib +add_library(btstack STATIC ${SOURCES}) + # pthread find_package(Threads) link_libraries(${CMAKE_THREAD_LIBS_INIT}) diff --git a/port/posix-h4-zephyr/CMakeLists.txt b/port/posix-h4-zephyr/CMakeLists.txt index 15fb8c2600..91a99404b4 100644 --- a/port/posix-h4-zephyr/CMakeLists.txt +++ b/port/posix-h4-zephyr/CMakeLists.txt @@ -72,9 +72,6 @@ set(SOURCES ) list(SORT SOURCES) -# create static lib -add_library(btstack STATIC ${SOURCES}) - # pkgconfig find_package(PkgConfig) @@ -90,6 +87,9 @@ if (PkgConfig_FOUND) endif() endif() +# create static lib +add_library(btstack STATIC ${SOURCES}) + # pthread find_package(Threads) link_libraries(${CMAKE_THREAD_LIBS_INIT}) diff --git a/port/posix-h4/CMakeLists.txt b/port/posix-h4/CMakeLists.txt index 71c8f4a730..91c79c0f06 100644 --- a/port/posix-h4/CMakeLists.txt +++ b/port/posix-h4/CMakeLists.txt @@ -148,9 +148,6 @@ set(SOURCES ) list(SORT SOURCES) -# create static lib -add_library(btstack STATIC ${SOURCES}) - # pkgconfig find_package(PkgConfig) @@ -166,6 +163,9 @@ if (PkgConfig_FOUND) endif() endif() +# create static lib +add_library(btstack STATIC ${SOURCES}) + # pthread find_package(Threads) link_libraries(${CMAKE_THREAD_LIBS_INIT}) diff --git a/port/windows-h4-da14585/CMakeLists.txt b/port/windows-h4-da14585/CMakeLists.txt index b99fb4de1c..3c8c6fc6de 100644 --- a/port/windows-h4-da14585/CMakeLists.txt +++ b/port/windows-h4-da14585/CMakeLists.txt @@ -66,9 +66,6 @@ set(SOURCES ) list(SORT SOURCES) -# create static lib -add_library(btstack STATIC ${SOURCES}) - # pkgconfig find_package(PkgConfig) @@ -84,6 +81,9 @@ if (PkgConfig_FOUND) endif() endif() +# create static lib +add_library(btstack STATIC ${SOURCES}) + # get list of examples, skipping mesh_node_demo include(../../example/CMakeLists.txt) set (EXAMPLES ${EXAMPLES_LE_ONLY} ${EXAMPLES_GENERAL}) diff --git a/port/windows-h4-zephyr/CMakeLists.txt b/port/windows-h4-zephyr/CMakeLists.txt index cf14a8a27d..d7d7c71cef 100644 --- a/port/windows-h4-zephyr/CMakeLists.txt +++ b/port/windows-h4-zephyr/CMakeLists.txt @@ -66,9 +66,6 @@ set(SOURCES ) list(SORT SOURCES) -# create static lib -add_library(btstack STATIC ${SOURCES}) - # pkgconfig find_package(PkgConfig) @@ -84,6 +81,9 @@ if (PkgConfig_FOUND) endif() endif() +# create static lib +add_library(btstack STATIC ${SOURCES}) + # get list of examples, skipping mesh_node_demo include(../../example/CMakeLists.txt) set (EXAMPLES ${EXAMPLES_LE_ONLY} ${EXAMPLES_GENERAL}) diff --git a/port/windows-h4/CMakeLists.txt b/port/windows-h4/CMakeLists.txt index a8b6273185..d87fc5e4ef 100644 --- a/port/windows-h4/CMakeLists.txt +++ b/port/windows-h4/CMakeLists.txt @@ -149,9 +149,6 @@ set(SOURCES ) list(SORT SOURCES) -# create static lib -add_library(btstack STATIC ${SOURCES}) - # pkgconfig find_package(PkgConfig) @@ -167,6 +164,9 @@ if (PkgConfig_FOUND) endif() endif() +# create static lib +add_library(btstack STATIC ${SOURCES}) + # Add CC256x Support and specify init script set (CC256X_INIT_SCRIPT bluetooth_init_cc2564C_1.5.c) include(${BTSTACK_ROOT}/chipset/cc256x/cc256x.cmake) diff --git a/port/windows-winusb-intel/CMakeLists.txt b/port/windows-winusb-intel/CMakeLists.txt index be262c37d3..2fc0975c1b 100644 --- a/port/windows-winusb-intel/CMakeLists.txt +++ b/port/windows-winusb-intel/CMakeLists.txt @@ -83,9 +83,6 @@ set(SOURCES ) list(SORT SOURCES) -# create static lib -add_library(btstack STATIC ${SOURCES}) - # pkgconfig find_package(PkgConfig QUIET) @@ -101,6 +98,9 @@ if (PkgConfig_FOUND) endif() endif() +# create static lib +add_library(btstack STATIC ${SOURCES}) + # get list of examples, skipping mesh_node_demo include(../../example/CMakeLists.txt) set (EXAMPLES ${EXAMPLES_GENERAL} ${EXAMPLES_CLASSIC_ONLY} ${EXAMPLES_LE_ONLY} ${EXAMPLES_DUAL_MODE}) diff --git a/port/windows-winusb/CMakeLists.txt b/port/windows-winusb/CMakeLists.txt index 3565f3c31b..f0da49a5d0 100644 --- a/port/windows-winusb/CMakeLists.txt +++ b/port/windows-winusb/CMakeLists.txt @@ -75,9 +75,6 @@ set(SOURCES ) list(SORT SOURCES) -# create static lib -add_library(btstack STATIC ${SOURCES}) - # pkgconfig find_package(PkgConfig QUIET) @@ -93,6 +90,9 @@ if (PkgConfig_FOUND) endif() endif() +# create static lib +add_library(btstack STATIC ${SOURCES}) + # get list of examples, skipping mesh_node_demo include(../../example/CMakeLists.txt) set (EXAMPLES ${EXAMPLES_GENERAL} ${EXAMPLES_CLASSIC_ONLY} ${EXAMPLES_LE_ONLY} ${EXAMPLES_DUAL_MODE}) diff --git a/test/avdtp/CMakeLists.txt b/test/avdtp/CMakeLists.txt index 36c6bf8674..39a6b85e9e 100644 --- a/test/avdtp/CMakeLists.txt +++ b/test/avdtp/CMakeLists.txt @@ -77,9 +77,6 @@ list(SORT SOURCES) set_source_files_properties(../../src/classic/hfp_ag.c PROPERTIES LANGUAGE CXX ) -# create static lib -add_library(btstack STATIC ${SOURCES}) - # portaudio pkg_check_modules(PORTAUDIO portaudio-2.0) if(PORTAUDIO_FOUND) @@ -90,6 +87,9 @@ if(PORTAUDIO_FOUND) add_compile_definitions(HAVE_PORTAUDIO) endif() +# create static lib +add_library(btstack STATIC ${SOURCES}) + # create targets for all examples file(GLOB EXAMPLES_C "*.c") list(SORT EXAMPLES_C) diff --git a/test/le_audio/CMakeLists.txt b/test/le_audio/CMakeLists.txt index 6d07a0429a..39b68bc660 100644 --- a/test/le_audio/CMakeLists.txt +++ b/test/le_audio/CMakeLists.txt @@ -76,9 +76,6 @@ set(SOURCES ) list(SORT SOURCES) -# create static lib -add_library(btstack STATIC ${SOURCES}) - # find pkgconfig find_package(PkgConfig REQUIRED) @@ -91,6 +88,9 @@ if(PORTAUDIO_FOUND) add_compile_definitions(HAVE_PORTAUDIO) endif() +# create static lib +add_library(btstack STATIC ${SOURCES}) + # fdk-aac pkg_check_modules(FDK_AAC fdk-aac) if(FDK_AAC_FOUND)