feat: Remove unnecessary portaudio include

feelfreelinux · Mar 24, 2024 · 541d1a3 · 541d1a3
1 parent 6a00d87
commit 541d1a3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 23 deletions.
diff --git a/cspot/CMakeLists.txt b/cspot/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 
 project(cspot)
 

diff --git a/flake.nix b/flake.nix
@@ -30,15 +30,7 @@
 
       clang-tools = pkgs.clang-tools.override {llvmPackages = llvm;};
 
-      apps = {
-      };
-
-      packages = {
-        target-cli = llvm.stdenv.mkDerivation {
-          name = "cspotcli";
-          src = ./.;
-          cmakeFlags = ["-DCSPOT_TARGET_CLI=ON"];
-          nativeBuildInputs = with pkgs; [
+      deps = with pkgs; [
             avahi
             avahi-compat
             cmake
@@ -49,7 +41,17 @@
             unstable.mbedtls
             portaudio
             protobuf
-          ];
+      ];
+
+      apps = {
+      };
+
+      packages = {
+        target-cli = llvm.stdenv.mkDerivation {
+          name = "cspotcli";
+          src = ./.;
+          cmakeFlags = ["-DCSPOT_TARGET_CLI=ON"];
+          nativeBuildInputs = deps;
           # Patch nanopb shebangs to refer to provided python
           postPatch = ''
             patchShebangs cspot/bell/external/nanopb/generator/*
@@ -60,7 +62,7 @@
 
       devShells = {
         default = pkgs.mkShell {
-          packages = with pkgs; [cmake unstable.mbedtls ninja python3] ++ [clang-tools llvm.clang];
+          packages = deps;
         };
       };
     in {

diff --git a/targets/cli/CMakeLists.txt b/targets/cli/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.3)
+cmake_minimum_required(VERSION 3.9)
 
 project(cspotcli)
 
@@ -13,8 +13,6 @@ if(CMAKE_EXPORT_COMPILE_COMMANDS)
       ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES})
 endif()
 
-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-
 # CMake options
 set(CMAKE_CXX_STANDARD 20)
 
@@ -26,10 +24,6 @@ endif()
 # Main target sources
 file(GLOB SOURCES "*.cpp")
 
-find_package(portaudio REQUIRED )
-include_directories( ${PORTAUDIO_INCLUDE_DIRS} )
-set(THINGS_TO_LINK ${THINGS_TO_LINK} ${PORTAUDIO_LIBRARIES})
-
 if(USE_PORTAUDIO)
     add_definitions(-DCSPOT_ENABLE_PORTAUDIO_SINK)
     set(BELL_SINK_PORTAUDIO ON)

diff --git a/targets/cli/cmake/Findportaudio.cmake b/targets/cli/cmake/Findportaudio.cmake