diff --git a/CMakeLists.txt b/CMakeLists.txt index 05d2e89ef..34c12e91e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -768,6 +768,17 @@ else (ENABLE_KDE) configure_file(mac/Info.plist.cmake ${CMAKE_CURRENT_BINARY_DIR}/mac/Info.plist) configure_file(mac/dmg/create-dmg.sh.in ${CMAKE_CURRENT_BINARY_DIR}/mac/create-dmg.sh) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mac/Info.plist DESTINATION ${CANTATA_APP_CONTENTS_DIR}) + if (TAGLIB_FOUND) + # *NEED* to install cantata-replagain/cantata-tags *before* install_qt5_executable fix'es the bundle + # If we install from their own CMakeLists.txt then they are installed *after* the fix-up, and so link + # to the build libs not the packaged ones! + if (FFMPEG_FOUND OR MPG123_FOUND) + install(PROGRAMS ${CMAKE_BINARY_DIR}/replaygain/cantata-replaygain DESTINATION ${MACOSX_BUNDLE_APP_DIR}) + endif (FFMPEG_FOUND OR MPG123_FOUND) + if (ENABLE_EXTERNAL_TAGS) + install(PROGRAMS ${CMAKE_BINARY_DIR}/tags/cantata-tags DESTINATION ${MACOSX_BUNDLE_APP_DIR}) + endif (ENABLE_EXTERNAL_TAGS) + endif (TAGLIB_FOUND) install_qt5_executable(cantata.app "qjpeg;qsvg;qsvgicon;qcocoa;qsqlite") elseif (NOT ENABLE_UBUNTU) ADD_EXECUTABLE(cantata ${CANTATA_SRCS} ${CANTATA_MOC_SRCS} ${CANTATA_RC_SRCS} ${CANTATA_UI_HDRS}) diff --git a/replaygain/CMakeLists.txt b/replaygain/CMakeLists.txt index b73e751e2..3a08b5d1e 100644 --- a/replaygain/CMakeLists.txt +++ b/replaygain/CMakeLists.txt @@ -30,7 +30,7 @@ if (FFMPEG_FOUND OR MPG123_FOUND) elseif (APPLE) set(CMAKE_BUILD_TYPE "Release") ADD_EXECUTABLE(cantata-replaygain ${CANTATA_RG_SRCS} ${CANTATA_RG_MOC_SRCS} ${CANTATA_PO}) - install(TARGETS cantata-replaygain DESTINATION ${MACOSX_BUNDLE_APP_DIR}) +# install(TARGETS cantata-replaygain DESTINATION ${MACOSX_BUNDLE_APP_DIR}) else (WIN32) ADD_EXECUTABLE(cantata-replaygain ${CANTATA_RG_SRCS} ${CANTATA_RG_MOC_SRCS}) install(TARGETS cantata-replaygain RUNTIME DESTINATION ${LINUX_LIB_DIR}/cantata) diff --git a/tags/CMakeLists.txt b/tags/CMakeLists.txt index 83f66bb1c..d4211f783 100644 --- a/tags/CMakeLists.txt +++ b/tags/CMakeLists.txt @@ -20,7 +20,7 @@ else (ENABLE_KDE_SUPPORT) elseif (APPLE) set(CMAKE_BUILD_TYPE "Release") ADD_EXECUTABLE(cantata-tags ${CANTATA_TAGS_SRCS} ${CANTATA_TAGS_MOC_SRCS}) - install(TARGETS cantata-tags DESTINATION ${MACOSX_BUNDLE_APP_DIR}) + #install(TARGETS cantata-tags DESTINATION ${MACOSX_BUNDLE_APP_DIR}) else (WIN32) ADD_EXECUTABLE(cantata-tags ${CANTATA_TAGS_SRCS} ${CANTATA_TAGS_MOC_SRCS}) install(TARGETS cantata-tags RUNTIME DESTINATION ${LINUX_LIB_DIR}/cantata)