Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes for compiling against qt5 on mac

Browse Source
This commit is contained in:
John Maguire 2018-12-05 18:16:34 +01:00
parent 1f87535c2f
commit 453270c8b5
7 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
3rdparty/libmygpo-qt5/src/CMakeLists.txt vendored
View File

@ -84,5 +84,4 @@ QT_WRAP_CPP(LIBMYGPO_QT_MOC_SRC ${LIBMYGPO_QT_MOC_H} )
add_library( ${MYGPO_QT_TARGET_NAME} STATIC ${LIBMYGPO_QT_SRC} ${LIBMYGPO_QT_MOC_SRC} ) add_library( ${MYGPO_QT_TARGET_NAME} STATIC ${LIBMYGPO_QT_SRC} ${LIBMYGPO_QT_MOC_SRC} )
target_link_libraries( ${MYGPO_QT_TARGET_NAME} ${QJSON_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ) target_link_libraries( ${MYGPO_QT_TARGET_NAME} ${QJSON_LIBRARIES} Qt5::Core Qt5::Network )
target_link_libraries( ${MYGPO_QT_TARGET_NAME} Qt5::Core Qt5::Network )

2
3rdparty/qocoa/CMakeLists.txt vendored
View File

@ -29,4 +29,4 @@ endif()
add_library(Qocoa STATIC add_library(Qocoa STATIC
${SOURCES} ${MOC_SOURCES} ${RESOURCES_SOURCES} ${SOURCES} ${MOC_SOURCES} ${RESOURCES_SOURCES}
) )
target_link_libraries(Qocoa ${QT_LIBRARIES}) target_link_libraries(Qocoa Qt5::Widgets Qt5::MacExtras)

6
CMakeLists.txt
View File

@ -35,12 +35,6 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
set(FREEBSD ON) set(FREEBSD ON)
endif() endif()
if(APPLE)
if(NOT QT_MAC_USE_COCOA)
message(FATAL_ERROR "Cocoa support is required")
endif(NOT QT_MAC_USE_COCOA)
endif(APPLE)
set(OpenGL_GL_PREFERENCE LEGACY) set(OpenGL_GL_PREFERENCE LEGACY)
find_package(OpenGL) find_package(OpenGL)
if(OPENGL_FOUND) if(OPENGL_FOUND)

23
dist/macdeploy.py vendored
View File

@ -30,6 +30,11 @@ FRAMEWORK_SEARCH_PATH = [
os.path.join(os.environ['HOME'], 'Library/Frameworks') os.path.join(os.environ['HOME'], 'Library/Frameworks')
] ]
STRIP_PREFIX = [
'@@HOMEBREW_PREFIX@@/opt/qt5/lib/',
'@@HOMEBREW_CELLAR@@/qt5/5.8.0_1/lib/',
]
LIBRARY_SEARCH_PATH = ['/target', '/target/lib', '/usr/local/lib', '/sw/lib'] LIBRARY_SEARCH_PATH = ['/target', '/target/lib', '/usr/local/lib', '/sw/lib']
GSTREAMER_PLUGINS = [ GSTREAMER_PLUGINS = [
@ -54,7 +59,7 @@ GSTREAMER_PLUGINS = [
'libgstapetag.so', 'libgstapetag.so',
'libgstasf.so', 'libgstasf.so',
'libgstaudioparsers.so', 'libgstaudioparsers.so',
'libgstfaac.so', #'libgstfaac.so',
'libgstfaad.so', 'libgstfaad.so',
'libgstflac.so', 'libgstflac.so',
'libgstid3demux.so', 'libgstid3demux.so',
@ -94,16 +99,16 @@ GSTREAMER_SEARCH_PATH = [
] ]
QT_PLUGINS = [ QT_PLUGINS = [
'accessible/libqtaccessiblewidgets.dylib', #'accessible/libqtaccessiblewidgets.dylib',
'codecs/libqcncodecs.dylib', #'codecs/libqcncodecs.dylib',
'codecs/libqjpcodecs.dylib', #'codecs/libqjpcodecs.dylib',
'codecs/libqkrcodecs.dylib', #'codecs/libqkrcodecs.dylib',
'codecs/libqtwcodecs.dylib', #'codecs/libqtwcodecs.dylib',
'iconengines/libqsvgicon.dylib', 'iconengines/libqsvgicon.dylib',
'imageformats/libqgif.dylib', 'imageformats/libqgif.dylib',
'imageformats/libqico.dylib', 'imageformats/libqico.dylib',
'imageformats/libqjpeg.dylib', 'imageformats/libqjpeg.dylib',
'imageformats/libqmng.dylib', #'imageformats/libqmng.dylib',
'imageformats/libqsvg.dylib', 'imageformats/libqsvg.dylib',
] ]
QT_PLUGINS_SEARCH_PATH = [ QT_PLUGINS_SEARCH_PATH = [
@ -206,6 +211,10 @@ def GetBrokenLibraries(binary):
def FindFramework(path): def FindFramework(path):
for prefix in STRIP_PREFIX:
if path.startswith(prefix):
path = path[len(prefix):]
break
for search_path in FRAMEWORK_SEARCH_PATH: for search_path in FRAMEWORK_SEARCH_PATH:
abs_path = os.path.join(search_path, path) abs_path = os.path.join(search_path, path)
if os.path.exists(abs_path): if os.path.exists(abs_path):

4
ext/clementine-tagreader/CMakeLists.txt
View File

@ -29,8 +29,8 @@ target_link_libraries(clementine-tagreader
${TAGLIB_LIBRARIES} ${TAGLIB_LIBRARIES}
libclementine-common libclementine-common
libclementine-tagreader libclementine-tagreader
${QT_QTCORE_LIBRARY} Qt5::Core
${QT_QTNETWORK_LIBRARY} Qt5::Network
z z
) )

5
ext/libclementine-common/CMakeLists.txt
View File

@ -35,9 +35,8 @@ add_library(libclementine-common STATIC
) )
target_link_libraries(libclementine-common target_link_libraries(libclementine-common
${QT_LIBRARIES} Qt5::Core
Qt5::Network
${TAGLIB_LIBRARIES} ${TAGLIB_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
) )
target_link_libraries(libclementine-common Qt5::Core Qt5::Network)

15
src/CMakeLists.txt
View File

@ -1244,13 +1244,22 @@ target_link_libraries(clementine_lib
libclementine-common libclementine-common
libclementine-tagreader libclementine-tagreader
libclementine-remote libclementine-remote
Qt5::Concurrent
Qt5::Core
Qt5::Network
Qt5::OpenGL
Qt5::OpenGL
Qt5::Sql
Qt5::Widgets
Qt5::Xml
${TAGLIB_LIBRARIES} ${TAGLIB_LIBRARIES}
${MYGPOQT5_LIBRARIES} ${MYGPOQT5_LIBRARIES}
${CHROMAPRINT_LIBRARIES} ${CHROMAPRINT_LIBRARIES}
${GOBJECT_LIBRARIES} ${GOBJECT_LIBRARIES}
${GLIB_LIBRARIES} ${GLIB_LIBRARIES}
${GIO_LIBRARIES} ${GIO_LIBRARIES}
${QT_LIBRARIES}
${GSTREAMER_BASE_LIBRARIES} ${GSTREAMER_BASE_LIBRARIES}
${GSTREAMER_LIBRARIES} ${GSTREAMER_LIBRARIES}
${GSTREAMER_APP_LIBRARIES} ${GSTREAMER_APP_LIBRARIES}
@ -1261,8 +1270,9 @@ target_link_libraries(clementine_lib
${QTIOCOMPRESSOR_LIBRARIES} ${QTIOCOMPRESSOR_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
${SQLITE_LIBRARIES} ${SQLITE_LIBRARIES}
z
Qocoa Qocoa
z
) )
if(HAVE_VISUALISATIONS) if(HAVE_VISUALISATIONS)
@ -1352,7 +1362,6 @@ if (WIN32)
${QTSPARKLE_LIBRARIES} ${QTSPARKLE_LIBRARIES}
tinysvcmdns tinysvcmdns
dsound dsound
${QT_QTGUI_LIBRARY}
) )
endif (WIN32) endif (WIN32)