mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-11 16:44:05 +02:00
Code Issues Releases Wiki Activity

Qt5 / Mac fixes.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-10-29 05:40:40 +01:00
parent 2135b99ccd
commit 4faf2c59b4
3 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -151,6 +151,10 @@ if( NOT BUILD_WITH_QT4 )
find_package(Qt5DBus REQUIRED) find_package(Qt5DBus REQUIRED)
endif() endif()
if(APPLE)
find_package(Qt5MacExtras REQUIRED)
endif()
if(WIN32) if(WIN32)
find_package(Qt5WinExtras REQUIRED) find_package(Qt5WinExtras REQUIRED)
endif() endif()
@@ -168,6 +172,7 @@ if( NOT BUILD_WITH_QT4 )
qt5_add_translation(${ARGN}) qt5_add_translation(${ARGN})
endmacro() endmacro()
if( UNIX AND NOT APPLE )
macro(qt_add_dbus_interface) macro(qt_add_dbus_interface)
qt5_add_dbus_interface(${ARGN}) qt5_add_dbus_interface(${ARGN})
endmacro() endmacro()
@@ -175,6 +180,7 @@ if( NOT BUILD_WITH_QT4 )
macro(qt_add_dbus_adaptor) macro(qt_add_dbus_adaptor)
qt5_add_dbus_adaptor(${ARGN}) qt5_add_dbus_adaptor(${ARGN})
endmacro() endmacro()
endif()
macro(setup_qt) macro(setup_qt)
endmacro() endmacro()

11
src/libtomahawk/CMakeLists.txt
View File

@@ -441,19 +441,11 @@ IF( APPLE )
mac/FileHelpers.mm mac/FileHelpers.mm
widgets/SourceTreePopupDialog_mac.mm ) widgets/SourceTreePopupDialog_mac.mm )
if( BUILD_WITH_QT4 )
list(APPEND libSources list(APPEND libSources
thirdparty/Qocoa/qbutton_mac.mm thirdparty/Qocoa/qbutton_mac.mm
thirdparty/Qocoa/qsearchfield_mac.mm thirdparty/Qocoa/qsearchfield_mac.mm
thirdparty/Qocoa/qtoolbartabdialog_mac.mm thirdparty/Qocoa/qtoolbartabdialog_mac.mm
) )
else()
list(APPEND libSources
thirdparty/Qocoa/qbutton.cpp
thirdparty/Qocoa/qsearchfield.cpp
thirdparty/Qocoa/qtoolbartabdialog.cpp
)
endif()
SET_SOURCE_FILES_PROPERTIES(utils/TomahawkUtils_Mac.mm PROPERTIES COMPILE_FLAGS "-fvisibility=default") SET_SOURCE_FILES_PROPERTIES(utils/TomahawkUtils_Mac.mm PROPERTIES COMPILE_FLAGS "-fvisibility=default")
@@ -492,6 +484,9 @@ set_target_properties(
qt5_use_modules(tomahawklib Widgets Network Sql WebKitWidgets Concurrent Xml UiTools Svg) qt5_use_modules(tomahawklib Widgets Network Sql WebKitWidgets Concurrent Xml UiTools Svg)
IF(APPLE)
qt5_use_modules(tomahawklib MacExtras)
ENDIF()
IF(QCA2_FOUND) IF(QCA2_FOUND)
LIST(APPEND LINK_LIBRARIES ${QCA2_LIBRARIES} ) LIST(APPEND LINK_LIBRARIES ${QCA2_LIBRARIES} )

3
src/tomahawk/CMakeLists.txt
View File

@@ -167,6 +167,9 @@ SET_TARGET_PROPERTIES(tomahawk_bin
qt5_use_modules(tomahawk_bin Core Widgets Network Sql WebKitWidgets) qt5_use_modules(tomahawk_bin Core Widgets Network Sql WebKitWidgets)
if(APPLE)
qt5_use_modules(tomahawk_bin MacExtras)
endif()
if(WIN32) if(WIN32)
qt5_use_modules(tomahawk_bin WinExtras) qt5_use_modules(tomahawk_bin WinExtras)
endif() endif()