iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bundled helper apps linking to system libs not packaged libs.

Browse Source 
#675
This commit is contained in:
Craig Drummond
2015-07-18 13:30:33 +01:00
parent 9b46348bc7
commit 4edffd074e
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@@ -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})

2
replaygain/CMakeLists.txt
View File

@@ -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)

2
tags/CMakeLists.txt
View File

@@ -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)