diff --git a/dist/macdeploy.py b/dist/macdeploy.py index 49eaa0a82..8ffaef94a 100755 --- a/dist/macdeploy.py +++ b/dist/macdeploy.py @@ -424,6 +424,11 @@ for plugin in GSTREAMER_PLUGINS: FixPlugin(FindGstreamerPlugin('gst-plugin-scanner'), '.') +try: + FixPlugin('clementine-spotifyblob', '.') +except: + 'Failed to find spotify blob' + for plugin in QT_PLUGINS: FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin)) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cb229526c..2da0d15c1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1021,6 +1021,8 @@ endif(HAVE_BREAKPAD) if(HAVE_SPOTIFY) target_link_libraries(clementine_lib clementine-spotifyblob-messages) + add_dependencies(clementine_lib + clementine-spotifyblob) endif(HAVE_SPOTIFY) if (APPLE) @@ -1138,18 +1140,11 @@ if (APPLE) WORLD_READ WORLD_EXECUTE) endif (HAVE_BREAKPAD) - if (HAVE_SPOTIFY) - install(FILES ${CMAKE_BINARY_DIR}/clementine-spotifyblob - DESTINATION "${CMAKE_BINARY_DIR}/clementine.app/Contents/Resources" - PERMISSIONS OWNER_EXECUTE OWNER_READ - GROUP_EXECUTE GROUP_READ - WORLD_EXECUTE WORLD_READ) - endif (HAVE_SPOTIFY) - add_custom_command(TARGET clementine POST_BUILD COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../dist/macdeploy.py ${PROJECT_BINARY_DIR}/clementine.app -f + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/.. ) add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/clementine.breakpad diff --git a/src/radio/spotifyservice.cpp b/src/radio/spotifyservice.cpp index ddda4bb47..eabb8a5b9 100644 --- a/src/radio/spotifyservice.cpp +++ b/src/radio/spotifyservice.cpp @@ -34,7 +34,7 @@ SpotifyService::SpotifyService(RadioModel* parent) context_menu_(NULL), search_delay_(new QTimer(this)) { #ifdef Q_OS_DARWIN - blob_path_ = QCoreApplication::applicationDirPath() + "/../Resources/clementine-spotifyblob"; + blob_path_ = QCoreApplication::applicationDirPath() + "/../PlugIns/clementine-spotifyblob"; #else blob_path_ = QCoreApplication::applicationFilePath() + "-spotifyblob"; #endif