portaudio:fix compile error

bluekitchen · Feb 6, 2024 · e704e87 · e704e87
1 parent 1fa7a4b
commit e704e87
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 39 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)