From 5171150e4fc9e6ebd0c51013edd830b8332a1c7c Mon Sep 17 00:00:00 2001
From: John Maguire <john.maguire@creditkudos.com>
Date: Mon, 18 Mar 2019 17:57:57 +0000
Subject: [PATCH] Fix spotify blob detection on win32

---
 CMakeLists.txt                            | 12 ++++++------
 ext/clementine-spotifyblob/CMakeLists.txt |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e9db0c37..fe83ae886 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,6 +153,7 @@ endif()
 if (APPLE)
   find_library(SPARKLE Sparkle)
   find_library(LIBSPOTIFY libspotify)
+
   if(LIBSPOTIFY_FOUND)
     set(LIBSPOTIFY_INCLUDE_DIRS ${LIBSPOTIFY})
     set(LIBSPOTIFY_LIBRARIES ${LIBSPOTIFY})
@@ -281,6 +282,11 @@ optional_component(UDISKS2 ON "Devices: UDisks2 backend"
   DEPENDS "D-Bus support" DBUS_FOUND
 )
 
+optional_component(SPOTIFY_BLOB ON "Spotify support: non-GPL binary helper"
+  DEPENDS "protobuf" PROTOBUF_FOUND PROTOBUF_PROTOC_EXECUTABLE
+  DEPENDS "libspotify" LIBSPOTIFY_FOUND
+)
+
 if (CRYPTOPP_FOUND OR HAVE_SPOTIFY_BLOB)
   set(CRYPTOPP_OR_HAVE_SPOTIFY_BLOB ON)
 endif()
@@ -289,12 +295,6 @@ optional_component(SPOTIFY ON "Spotify support"
   DEPENDS "cryptopp or spotify blob" CRYPTOPP_OR_HAVE_SPOTIFY_BLOB
 )
 
-optional_component(SPOTIFY_BLOB ON "Spotify support: non-GPL binary helper"
-  DEPENDS "spotify support" HAVE_SPOTIFY
-  DEPENDS "protobuf" PROTOBUF_FOUND PROTOBUF_PROTOC_EXECUTABLE
-  DEPENDS "libspotify" LIBSPOTIFY_FOUND
-)
-
 optional_component(MOODBAR ON "Moodbar support"
   DEPENDS "fftw3" FFTW3_FOUND
 )
diff --git a/ext/clementine-spotifyblob/CMakeLists.txt b/ext/clementine-spotifyblob/CMakeLists.txt
index 28ee96382..7568a2931 100644
--- a/ext/clementine-spotifyblob/CMakeLists.txt
+++ b/ext/clementine-spotifyblob/CMakeLists.txt
@@ -41,7 +41,7 @@ add_executable(clementine-spotifyblob
 )
 
 target_link_libraries(clementine-spotifyblob
-  ${SPOTIFY_LIBRARIES} ${SPOTIFY_LDFLAGS}
+  ${LIBSPOTIFY_LIBRARIES} ${LIBSPOTIFY_LDFLAGS}
   ${QT_QTCORE_LIBRARY}
   ${QT_QTNETWORK_LIBRARY}
   ${GSTREAMER_BASE_LIBRARIES}