From 7613b2f5261da82e7a8f7c4368b60fb77dbb2d9e Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sat, 17 Nov 2018 16:28:05 +0100 Subject: [PATCH] Add alsa to optional_component --- CMakeLists.txt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 83370ae34..daa80d329 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,9 +88,6 @@ else(LINUX) find_package(ALSA) pkg_check_modules(DBUS dbus-1) endif(LINUX) -if(ALSA_FOUND) - set(HAVE_ALSA ON) -endif() if (NOT APPLE) find_package(X11) endif() @@ -269,6 +266,14 @@ if(WIN32) option(ENABLE_WIN32_CONSOLE "Show the windows console even outside Debug mode" OFF) endif(WIN32) +optional_component(ALSA ON "ALSA integration" + DEPENDS "alsa" ALSA_FOUND +) + +optional_component(LIBPULSE ON "Pulse audio integration" + DEPENDS "libpulse" LIBPULSE_FOUND +) + optional_component(DBUS ON "D-Bus support" DEPENDS "D-Bus" DBUS_FOUND ) @@ -305,10 +310,6 @@ else () ) endif() -optional_component(LIBPULSE ON "Pulse audio integration" - DEPENDS "libpulse" LIBPULSE_FOUND -) - optional_component(LIBLASTFM ON "Last.fm album cover provider" DEPENDS "liblastfm" LASTFM5_LIBRARIES LASTFM5_INCLUDE_DIRS )