From ec3d0c0738a61efcc28b65850d2039c3737fc8d5 Mon Sep 17 00:00:00 2001 From: crueter Date: Mon, 28 Jul 2025 02:35:24 -0400 Subject: [PATCH] [cmake] fix cubeb bbbbbb and libusb Signed-off-by: crueter --- externals/CMakeLists.txt | 2 -- externals/libusb/CMakeLists.txt | 6 ++++++ externals/libusb/config.h.in | 4 ++++ src/audio_core/externals/cubeb/CMakeLists.txt | 2 ++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index e988bb4205..f92868d64b 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -10,8 +10,6 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) # Disable tests/tools in all externals supporting the standard option name set(BUILD_TESTING OFF) -set(BUILD_TESTS OFF) -set(BUILD_TOOLS OFF) # Build only static externals set(BUILD_SHARED_LIBS OFF) diff --git a/externals/libusb/CMakeLists.txt b/externals/libusb/CMakeLists.txt index 1d50c9f8c8..ec7724e874 100644 --- a/externals/libusb/CMakeLists.txt +++ b/externals/libusb/CMakeLists.txt @@ -235,6 +235,12 @@ else() # MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux") ) endif() + if(UNIX) + set(PLATFORM_POSIX TRUE) + else() + set(PLATFORM_WINDOWS TRUE) + endif() + include(CheckFunctionExists) include(CheckIncludeFiles) include(CheckTypeSize) diff --git a/externals/libusb/config.h.in b/externals/libusb/config.h.in index 42ae5a5e8a..9ddc6c1276 100644 --- a/externals/libusb/config.h.in +++ b/externals/libusb/config.h.in @@ -93,3 +93,7 @@ /* Oldest Windows version supported */ #define WINVER 0x0501 + +#cmakedefine PLATFORM_POSIX + +#cmakedefine PLATFORM_WINDOWS diff --git a/src/audio_core/externals/cubeb/CMakeLists.txt b/src/audio_core/externals/cubeb/CMakeLists.txt index f7cc2907a5..ffa26358ba 100644 --- a/src/audio_core/externals/cubeb/CMakeLists.txt +++ b/src/audio_core/externals/cubeb/CMakeLists.txt @@ -10,6 +10,8 @@ CPMAddPackage( FIND_PACKAGE_ARGUMENTS "CONFIG" # not sure this works outside of gentoo OPTIONS "USE_SANITIZERS OFF" + "BUILD_TESTS OFF" + "BUILD_TOOLS OFF" ) if (cubeb_ADDED)