From 7367e9aa96828e59d011d48c0f48b84d1c8f2495 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Mon, 21 Nov 2022 14:26:59 +0100 Subject: [PATCH] port: make pkg-config check optional where possible, add portaudio --- port/posix-h4-zephyr/CMakeLists.txt | 20 +++++++++++--------- port/posix-h4/CMakeLists.txt | 16 ++++++++++++++++ port/qt-h4/CMakeLists.txt | 16 ++++++++++++++++ port/qt-usb/CMakeLists.txt | 16 ++++++++++++++++ port/windows-h4-da14585/CMakeLists.txt | 20 +++++++++++--------- port/windows-h4-zephyr/CMakeLists.txt | 20 +++++++++++--------- port/windows-h4/CMakeLists.txt | 20 +++++++++++--------- port/windows-winusb-intel/CMakeLists.txt | 20 +++++++++++--------- port/windows-winusb/CMakeLists.txt | 20 +++++++++++--------- 9 files changed, 114 insertions(+), 54 deletions(-) diff --git a/port/posix-h4-zephyr/CMakeLists.txt b/port/posix-h4-zephyr/CMakeLists.txt index 9c74a1985..ee0db6c11 100644 --- a/port/posix-h4-zephyr/CMakeLists.txt +++ b/port/posix-h4-zephyr/CMakeLists.txt @@ -8,17 +8,19 @@ project(BTstack-posix-h4-zephyr) SET(BTSTACK_ROOT ${CMAKE_SOURCE_DIR}/../..) # pkgconfig -find_package(PkgConfig REQUIRED) +find_package(PkgConfig QUIET) # portaudio -pkg_check_modules(PORTAUDIO REQUIRED portaudio-2.0) -if(PORTAUDIO_FOUND) - message("HAVE_PORTAUDIO") - include_directories(${PORTAUDIO_INCLUDE_DIRS}) - link_directories(${PORTAUDIO_LIBRARY_DIRS}) - link_libraries(${PORTAUDIO_LIBRARIES}) - # CMake 3.12 - add_compile_definitions(HAVE_PORTAUDIO) - SET(CMAKE_C_FLAGS "-DHAVE_PORTAUDIO") +if (PkgConfig_FOUND) + pkg_check_modules(PORTAUDIO REQUIRED portaudio-2.0) + if(PORTAUDIO_FOUND) + message("HAVE_PORTAUDIO") + include_directories(${PORTAUDIO_INCLUDE_DIRS}) + link_directories(${PORTAUDIO_LIBRARY_DIRS}) + link_libraries(${PORTAUDIO_LIBRARIES}) + # CMake 3.12 - add_compile_definitions(HAVE_PORTAUDIO) + SET(CMAKE_C_FLAGS "-DHAVE_PORTAUDIO") + endif() endif() # pthread diff --git a/port/posix-h4/CMakeLists.txt b/port/posix-h4/CMakeLists.txt index 88e29e9c2..bef251dfb 100644 --- a/port/posix-h4/CMakeLists.txt +++ b/port/posix-h4/CMakeLists.txt @@ -17,6 +17,22 @@ elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC") # using Visual Studio C++ endif() +# pkgconfig +find_package(PkgConfig QUIET) + +# portaudio +if (PgConfig_FOUND) + pkg_check_modules(PORTAUDIO REQUIRED portaudio-2.0) + if(PORTAUDIO_FOUND) + message("HAVE_PORTAUDIO") + include_directories(${PORTAUDIO_INCLUDE_DIRS}) + link_directories(${PORTAUDIO_LIBRARY_DIRS}) + link_libraries(${PORTAUDIO_LIBRARIES}) + # CMake 3.12 - add_compile_definitions(HAVE_PORTAUDIO) + SET(CMAKE_C_FLAGS "-DHAVE_PORTAUDIO") + endif() +endif() + # to generate .h from .gatt files find_package (Python REQUIRED COMPONENTS Interpreter) include_directories(${CMAKE_CURRENT_BINARY_DIR}) diff --git a/port/qt-h4/CMakeLists.txt b/port/qt-h4/CMakeLists.txt index c0791c2f0..0de9d6c47 100644 --- a/port/qt-h4/CMakeLists.txt +++ b/port/qt-h4/CMakeLists.txt @@ -13,6 +13,22 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) message("${Qt5_DIR}") +# pkgconfig +find_package(PkgConfig QUIET) + +# portaudio +if (PkgConfig_FOUND) + pkg_check_modules(PORTAUDIO REQUIRED portaudio-2.0) + if(PORTAUDIO_FOUND) + message("HAVE_PORTAUDIO") + include_directories(${PORTAUDIO_INCLUDE_DIRS}) + link_directories(${PORTAUDIO_LIBRARY_DIRS}) + link_libraries(${PORTAUDIO_LIBRARIES}) + # CMake 3.12 - add_compile_definitions(HAVE_PORTAUDIO) + SET(CMAKE_C_FLAGS "-DHAVE_PORTAUDIO") + endif() +endif() + find_package(Qt5Core) find_package(FindPython3) diff --git a/port/qt-usb/CMakeLists.txt b/port/qt-usb/CMakeLists.txt index 387b9a5b9..8a43e2842 100644 --- a/port/qt-usb/CMakeLists.txt +++ b/port/qt-usb/CMakeLists.txt @@ -16,6 +16,22 @@ message("${Qt5_DIR}") find_package(Qt5Core) include(FindPythonInterp) +# pkgconfig +find_package(PkgConfig QUIET) + +# portaudio +if (PkgConfig_FOUND) + pkg_check_modules(PORTAUDIO REQUIRED portaudio-2.0) + if(PORTAUDIO_FOUND) + message("HAVE_PORTAUDIO") + include_directories(${PORTAUDIO_INCLUDE_DIRS}) + link_directories(${PORTAUDIO_LIBRARY_DIRS}) + link_libraries(${PORTAUDIO_LIBRARIES}) + # CMake 3.12 - add_compile_definitions(HAVE_PORTAUDIO) + SET(CMAKE_C_FLAGS "-DHAVE_PORTAUDIO") + endif() +endif() + # BTstack Root set(BTSTACK_ROOT "../..") message("BTSTACK_ROOT: ${BTSTACK_ROOT}") diff --git a/port/windows-h4-da14585/CMakeLists.txt b/port/windows-h4-da14585/CMakeLists.txt index 7e1513adc..3b128e74d 100644 --- a/port/windows-h4-da14585/CMakeLists.txt +++ b/port/windows-h4-da14585/CMakeLists.txt @@ -18,17 +18,19 @@ elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC") endif() # pkgconfig -find_package(PkgConfig REQUIRED) +find_package(PkgConfig QUIET) # portaudio -pkg_check_modules(PORTAUDIO REQUIRED portaudio-2.0) -if(PORTAUDIO_FOUND) - message("HAVE_PORTAUDIO") - include_directories(${PORTAUDIO_INCLUDE_DIRS}) - link_directories(${PORTAUDIO_LIBRARY_DIRS}) - link_libraries(${PORTAUDIO_LIBRARIES}) - # CMake 3.12 - add_compile_definitions(HAVE_PORTAUDIO) - SET(CMAKE_C_FLAGS "-DHAVE_PORTAUDIO") +if (PkgConfig_FOUND) + pkg_check_modules(PORTAUDIO REQUIRED portaudio-2.0) + if(PORTAUDIO_FOUND) + message("HAVE_PORTAUDIO") + include_directories(${PORTAUDIO_INCLUDE_DIRS}) + link_directories(${PORTAUDIO_LIBRARY_DIRS}) + link_libraries(${PORTAUDIO_LIBRARIES}) + # CMake 3.12 - add_compile_definitions(HAVE_PORTAUDIO) + SET(CMAKE_C_FLAGS "-DHAVE_PORTAUDIO") + endif() endif() # to generate .h from .gatt files diff --git a/port/windows-h4-zephyr/CMakeLists.txt b/port/windows-h4-zephyr/CMakeLists.txt index 14566ac2d..219d0b666 100644 --- a/port/windows-h4-zephyr/CMakeLists.txt +++ b/port/windows-h4-zephyr/CMakeLists.txt @@ -18,17 +18,19 @@ elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC") endif() # pkgconfig -find_package(PkgConfig REQUIRED) +find_package(PkgConfig QUIET) # portaudio -pkg_check_modules(PORTAUDIO REQUIRED portaudio-2.0) -if(PORTAUDIO_FOUND) - message("HAVE_PORTAUDIO") - include_directories(${PORTAUDIO_INCLUDE_DIRS}) - link_directories(${PORTAUDIO_LIBRARY_DIRS}) - link_libraries(${PORTAUDIO_LIBRARIES}) - # CMake 3.12 - add_compile_definitions(HAVE_PORTAUDIO) - SET(CMAKE_C_FLAGS "-DHAVE_PORTAUDIO") +if (PkgConfig_FOUND) + pkg_check_modules(PORTAUDIO REQUIRED portaudio-2.0) + if(PORTAUDIO_FOUND) + message("HAVE_PORTAUDIO") + include_directories(${PORTAUDIO_INCLUDE_DIRS}) + link_directories(${PORTAUDIO_LIBRARY_DIRS}) + link_libraries(${PORTAUDIO_LIBRARIES}) + # CMake 3.12 - add_compile_definitions(HAVE_PORTAUDIO) + SET(CMAKE_C_FLAGS "-DHAVE_PORTAUDIO") + endif() endif() # to generate .h from .gatt files diff --git a/port/windows-h4/CMakeLists.txt b/port/windows-h4/CMakeLists.txt index c226f239a..b5ee7b40c 100644 --- a/port/windows-h4/CMakeLists.txt +++ b/port/windows-h4/CMakeLists.txt @@ -18,17 +18,19 @@ elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC") endif() # pkgconfig -find_package(PkgConfig REQUIRED) +find_package(PkgConfig QUIET) # portaudio -pkg_check_modules(PORTAUDIO REQUIRED portaudio-2.0) -if(PORTAUDIO_FOUND) - message("HAVE_PORTAUDIO") - include_directories(${PORTAUDIO_INCLUDE_DIRS}) - link_directories(${PORTAUDIO_LIBRARY_DIRS}) - link_libraries(${PORTAUDIO_LIBRARIES}) - # CMake 3.12 - add_compile_definitions(HAVE_PORTAUDIO) - SET(CMAKE_C_FLAGS "-DHAVE_PORTAUDIO") +if (PkgConfig_FOUND) + pkg_check_modules(PORTAUDIO REQUIRED portaudio-2.0) + if(PORTAUDIO_FOUND) + message("HAVE_PORTAUDIO") + include_directories(${PORTAUDIO_INCLUDE_DIRS}) + link_directories(${PORTAUDIO_LIBRARY_DIRS}) + link_libraries(${PORTAUDIO_LIBRARIES}) + # CMake 3.12 - add_compile_definitions(HAVE_PORTAUDIO) + SET(CMAKE_C_FLAGS "-DHAVE_PORTAUDIO") + endif() endif() # to generate .h from .gatt files diff --git a/port/windows-winusb-intel/CMakeLists.txt b/port/windows-winusb-intel/CMakeLists.txt index c2f1d56ae..f2c98daba 100644 --- a/port/windows-winusb-intel/CMakeLists.txt +++ b/port/windows-winusb-intel/CMakeLists.txt @@ -18,17 +18,19 @@ elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC") endif() # pkgconfig -find_package(PkgConfig REQUIRED) +find_package(PkgConfig QUIET) # portaudio -pkg_check_modules(PORTAUDIO REQUIRED portaudio-2.0) -if(PORTAUDIO_FOUND) - message("HAVE_PORTAUDIO") - include_directories(${PORTAUDIO_INCLUDE_DIRS}) - link_directories(${PORTAUDIO_LIBRARY_DIRS}) - link_libraries(${PORTAUDIO_LIBRARIES}) - # CMake 3.12 - add_compile_definitions(HAVE_PORTAUDIO) - SET(CMAKE_C_FLAGS "-DHAVE_PORTAUDIO") +if (PkgConfig_FOUND) + pkg_check_modules(PORTAUDIO REQUIRED portaudio-2.0) + if(PORTAUDIO_FOUND) + message("HAVE_PORTAUDIO") + include_directories(${PORTAUDIO_INCLUDE_DIRS}) + link_directories(${PORTAUDIO_LIBRARY_DIRS}) + link_libraries(${PORTAUDIO_LIBRARIES}) + # CMake 3.12 - add_compile_definitions(HAVE_PORTAUDIO) + SET(CMAKE_C_FLAGS "-DHAVE_PORTAUDIO") + endif() endif() # Generate .h from .gatt files diff --git a/port/windows-winusb/CMakeLists.txt b/port/windows-winusb/CMakeLists.txt index fe60cd555..ffd1c6e28 100644 --- a/port/windows-winusb/CMakeLists.txt +++ b/port/windows-winusb/CMakeLists.txt @@ -18,17 +18,19 @@ elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC") endif() # pkgconfig -find_package(PkgConfig REQUIRED) +find_package(PkgConfig QUIET) # portaudio -pkg_check_modules(PORTAUDIO REQUIRED portaudio-2.0) -if(PORTAUDIO_FOUND) - message("HAVE_PORTAUDIO") - include_directories(${PORTAUDIO_INCLUDE_DIRS}) - link_directories(${PORTAUDIO_LIBRARY_DIRS}) - link_libraries(${PORTAUDIO_LIBRARIES}) - # CMake 3.12 - add_compile_definitions(HAVE_PORTAUDIO) - SET(CMAKE_C_FLAGS "-DHAVE_PORTAUDIO") +if (PkgConfig_FOUND) + pkg_check_modules(PORTAUDIO REQUIRED portaudio-2.0) + if(PORTAUDIO_FOUND) + message("HAVE_PORTAUDIO") + include_directories(${PORTAUDIO_INCLUDE_DIRS}) + link_directories(${PORTAUDIO_LIBRARY_DIRS}) + link_libraries(${PORTAUDIO_LIBRARIES}) + # CMake 3.12 - add_compile_definitions(HAVE_PORTAUDIO) + SET(CMAKE_C_FLAGS "-DHAVE_PORTAUDIO") + endif() endif() # to generate .h from .gatt files