mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-04-21 08:21:54 +02:00
Code Issues Releases Wiki Activity

Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)

Browse Source
This commit is contained in:
Andreas Sturmlechner 2018-04-17 13:09:25 +02:00 committed by Dominik Schmidt
parent 00f602e102
commit 34c1f88171
12 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -243,9 +243,6 @@ if( NOT Qt5Core_DIR )
macro_optional_find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS} )
macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI framework" "http://qt-project.org" TRUE "" "If you see this, although libqt4-devel is installed, check whether the \n qtwebkit-devel package and whatever contains QtUiTools is installed too")
macro(qt5_use_modules)
endmacro()
macro(qt_wrap_ui)
qt4_wrap_ui(${ARGN})
endmacro()

2
TomahawkAddLibrary.cmake
View File

@ -46,7 +46,7 @@ function(tomahawk_add_library)
endif()
# HACK: add qt modules - every lib should define its own set of modules
qt5_use_modules(${target} Core Network Widgets Sql Xml ${LIBRARY_QT5_MODULES})
target_link_libraries(${target} Qt5::Core Qt5::Network Qt5::Widgets Qt5::Sql Qt5::Xml)
# definitions - can this be moved into set_target_properties below?
add_definitions(${QT_DEFINITIONS})

3
TomahawkUse.cmake.in
View File

@ -81,9 +81,6 @@ else(TOMAHAWK_QT5)
find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS})
include( ${QT_USE_FILE} )
macro(qt5_use_modules)
endmacro()
macro(qt_wrap_ui)
qt4_wrap_ui(${ARGN})
endmacro()

4
src/crashreporter/CMakeLists.txt
View File

@ -43,7 +43,7 @@ target_link_libraries( ${TOMAHAWK_CRASH_REPORTER_TARGET}
${QT_LIBRARIES}
)
target_link_libraries(${TOMAHAWK_CRASH_REPORTER_TARGET} Qt5::Widgets Qt5::Network)
set_target_properties(${TOMAHAWK_CRASH_REPORTER_TARGET} PROPERTIES AUTOMOC ON)
install(TARGETS ${TOMAHAWK_CRASH_REPORTER_TARGET} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR})
qt5_use_modules(${TOMAHAWK_CRASH_REPORTER_TARGET} Widgets Network)

16
src/libtomahawk/CMakeLists.txt
View File

@ -500,12 +500,15 @@ set_target_properties(
OUTPUT_NAME ${TOMAHAWK_BASE_TARGET_NAME}
)
qt5_use_modules(${TOMAHAWK_LIBRARY} Widgets Network Sql WebKitWidgets Concurrent Xml UiTools Svg)
IF(APPLE)
qt5_use_modules(${TOMAHAWK_LIBRARY} MacExtras)
ENDIF()
target_link_libraries(${TOMAHAWK_LIBRARY}
Qt5::Widgets Qt5::Network Qt5::Sql Qt5::WebKitWidgets Qt5::Concurrent Qt5::Xml Qt5::UiTools Qt5::Svg
)
if(APPLE)
target_link_libraries(${TOMAHAWK_LIBRARY} Qt5::MacExtras)
endif()
if( UNIX AND NOT APPLE )
target_link_libraries(${TOMAHAWK_LIBRARY} Qt5::DBus)
endif()
IF(QCA2_FOUND)
INCLUDE_DIRECTORIES( ${QCA2_INCLUDE_DIR} )
@ -514,7 +517,6 @@ ENDIF(QCA2_FOUND)
IF( UNIX AND NOT APPLE )
LIST(APPEND LINK_LIBRARIES ${QT_QTDBUS_LIBRARIES} )
qt5_use_modules(${TOMAHAWK_LIBRARY} DBus)
ENDIF( UNIX AND NOT APPLE )
TARGET_LINK_LIBRARIES( ${TOMAHAWK_LIBRARY}

6
src/tests/tomahawk_add_test.cmake
View File

@ -16,8 +16,10 @@ macro(tomahawk_add_test test_class)
${QT_QTCORE_LIBRARY}
)
target_link_libraries(${TOMAHAWK_TEST_TARGET}
Qt5::Core Qt5::Network Qt5::Widgets Qt5::Sql Qt5::Xml Qt5::Test
)
add_test(NAME ${TOMAHAWK_TEST_TARGET} COMMAND ${TOMAHAWK_TEST_TARGET})
qt5_use_modules(${TOMAHAWK_TEST_TARGET} Core Network Widgets Sql Xml Test)
endmacro()

9
src/tomahawk/CMakeLists.txt
View File

@ -171,13 +171,14 @@ SET_TARGET_PROPERTIES( ${TOMAHAWK_APPLICATION_TARGET}
RUNTIME_OUTPUT_NAME ${TOMAHAWK_RUNTIME_OUTPUT_NAME}
)
qt5_use_modules(${TOMAHAWK_APPLICATION_TARGET} Core Widgets Network Sql WebKitWidgets)
target_link_libraries(${TOMAHAWK_APPLICATION_TARGET}
Qt5::Core Qt5::Widgets Qt5::Network Qt5::Sql Qt5::WebKitWidgets
)
if(APPLE)
qt5_use_modules(${TOMAHAWK_APPLICATION_TARGET} MacExtras)
target_link_libraries(${TOMAHAWK_APPLICATION_TARGET} Qt5::MacExtras)
endif()
if(WIN32)
qt5_use_modules(${TOMAHAWK_APPLICATION_TARGET} WinExtras)
target_link_libraries(${TOMAHAWK_APPLICATION_TARGET} Qt5::WinExtras)
endif()
MESSAGE( STATUS "OS_SPECIFIC_LINK_LIBRARIES: ${OS_SPECIFIC_LINK_LIBRARIES}" )

2
src/tools/database-reader/CMakeLists.txt
View File

@ -15,7 +15,7 @@ set_target_properties( ${TOMAHAWK_TOOL_DB_LIST_ARTISTS_TARGET}
target_link_libraries( ${TOMAHAWK_TOOL_DB_LIST_ARTISTS_TARGET}
${TOMAHAWK_LIBRARIES}
)
target_link_libraries(${TOMAHAWK_TOOL_DB_LIST_ARTISTS_TARGET} Qt5::Core)
qt5_use_modules(${TOMAHAWK_TOOL_DB_LIST_ARTISTS_TARGET} Core)
install( TARGETS ${TOMAHAWK_TOOL_DB_LIST_ARTISTS_TARGET} BUNDLE DESTINATION . RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )

2
src/tools/tomahawk-test-musicscan/CMakeLists.txt
View File

@ -14,6 +14,6 @@ set_target_properties( ${TOMAHAWK_TOOL_MUSICSCAN_TARGET}
target_link_libraries( ${TOMAHAWK_TOOL_MUSICSCAN_TARGET}
${TOMAHAWK_LIBRARIES}
)
target_link_libraries(${TOMAHAWK_TOOL_MUSICSCAN_TARGET} Qt5::Core Qt5::Gui Qt5::Network Qt5::Widgets)
qt5_use_modules(${TOMAHAWK_TOOL_MUSICSCAN_TARGET} Core Gui Network Widgets)
install( TARGETS ${TOMAHAWK_TOOL_MUSICSCAN_TARGET} BUNDLE DESTINATION . RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )

2
thirdparty/kdsingleapplicationguard/CMakeLists.txt vendored
View File

@ -24,4 +24,4 @@ set_target_properties(
PROPERTIES
AUTOMOC TRUE
)
qt5_use_modules(kdsingleapplicationguard Core)
target_link_libraries(kdsingleapplicationguard Qt5::Core)

4
thirdparty/qt-certificate-addon/src/certificate/CMakeLists.txt vendored
View File

@ -25,6 +25,4 @@ set_target_properties(
PROPERTIES
AUTOMOC TRUE
)
qt5_use_modules(qtcertificateaddon Core Network)
target_link_libraries(qtcertificateaddon Qt5::Core Qt5::Network)

7
thirdparty/qxt/qxtweb-standalone/CMakeLists.txt vendored
View File

@ -73,11 +73,6 @@ ADD_LIBRARY( qxtweb-standalone STATIC
${sources}
)
target_link_libraries( qxtweb-standalone
${QT_LIBRARIES}
)
qt5_use_modules( qxtweb-standalone Network )
target_link_libraries( qxtweb-standalone Qt5::Network)
set_target_properties( qxtweb-standalone PROPERTIES AUTOMOC TRUE )