Fix spotify blob detection on win32
This commit is contained in:
parent
106bb73aec
commit
5171150e4f
|
@ -153,6 +153,7 @@ endif()
|
||||||
if (APPLE)
|
if (APPLE)
|
||||||
find_library(SPARKLE Sparkle)
|
find_library(SPARKLE Sparkle)
|
||||||
find_library(LIBSPOTIFY libspotify)
|
find_library(LIBSPOTIFY libspotify)
|
||||||
|
|
||||||
if(LIBSPOTIFY_FOUND)
|
if(LIBSPOTIFY_FOUND)
|
||||||
set(LIBSPOTIFY_INCLUDE_DIRS ${LIBSPOTIFY})
|
set(LIBSPOTIFY_INCLUDE_DIRS ${LIBSPOTIFY})
|
||||||
set(LIBSPOTIFY_LIBRARIES ${LIBSPOTIFY})
|
set(LIBSPOTIFY_LIBRARIES ${LIBSPOTIFY})
|
||||||
|
@ -281,6 +282,11 @@ optional_component(UDISKS2 ON "Devices: UDisks2 backend"
|
||||||
DEPENDS "D-Bus support" DBUS_FOUND
|
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)
|
if (CRYPTOPP_FOUND OR HAVE_SPOTIFY_BLOB)
|
||||||
set(CRYPTOPP_OR_HAVE_SPOTIFY_BLOB ON)
|
set(CRYPTOPP_OR_HAVE_SPOTIFY_BLOB ON)
|
||||||
endif()
|
endif()
|
||||||
|
@ -289,12 +295,6 @@ optional_component(SPOTIFY ON "Spotify support"
|
||||||
DEPENDS "cryptopp or spotify blob" CRYPTOPP_OR_HAVE_SPOTIFY_BLOB
|
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"
|
optional_component(MOODBAR ON "Moodbar support"
|
||||||
DEPENDS "fftw3" FFTW3_FOUND
|
DEPENDS "fftw3" FFTW3_FOUND
|
||||||
)
|
)
|
||||||
|
|
|
@ -41,7 +41,7 @@ add_executable(clementine-spotifyblob
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(clementine-spotifyblob
|
target_link_libraries(clementine-spotifyblob
|
||||||
${SPOTIFY_LIBRARIES} ${SPOTIFY_LDFLAGS}
|
${LIBSPOTIFY_LIBRARIES} ${LIBSPOTIFY_LDFLAGS}
|
||||||
${QT_QTCORE_LIBRARY}
|
${QT_QTCORE_LIBRARY}
|
||||||
${QT_QTNETWORK_LIBRARY}
|
${QT_QTNETWORK_LIBRARY}
|
||||||
${GSTREAMER_BASE_LIBRARIES}
|
${GSTREAMER_BASE_LIBRARIES}
|
||||||
|
|
Loading…
Reference in New Issue