From ded70d655549da40d15c22a3bc4860c0a13c8d76 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Sat, 11 Apr 2015 22:51:40 +0200 Subject: [PATCH] Update internals CMakeLits to qt5 --- ext/clementine-spotifyblob/CMakeLists.txt | 2 +- ext/clementine-tagreader/CMakeLists.txt | 4 +- ext/libclementine-common/CMakeLists.txt | 4 +- ext/libclementine-tagreader/CMakeLists.txt | 2 +- gst/moodbar/CMakeLists.txt | 2 + src/CMakeLists.txt | 52 ++++++++++----------- tests/CMakeLists.txt | 4 +- tools/ultimate_lyrics_parser/CMakeLists.txt | 3 +- 8 files changed, 39 insertions(+), 34 deletions(-) diff --git a/ext/clementine-spotifyblob/CMakeLists.txt b/ext/clementine-spotifyblob/CMakeLists.txt index f971216b5..96d558c39 100644 --- a/ext/clementine-spotifyblob/CMakeLists.txt +++ b/ext/clementine-spotifyblob/CMakeLists.txt @@ -28,7 +28,7 @@ if(APPLE) list(APPEND SOURCES spotify_utilities.mm) endif(APPLE) -qt4_wrap_cpp(MOC ${HEADERS}) +qt5_wrap_cpp(MOC ${HEADERS}) if(WIN32 AND NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT ENABLE_WIN32_CONSOLE) set(win32_build_flag WIN32) diff --git a/ext/clementine-tagreader/CMakeLists.txt b/ext/clementine-tagreader/CMakeLists.txt index b88169697..bee991195 100644 --- a/ext/clementine-tagreader/CMakeLists.txt +++ b/ext/clementine-tagreader/CMakeLists.txt @@ -16,8 +16,8 @@ set(SOURCES tagreaderworker.cpp ) -qt4_wrap_cpp(MOC ${HEADERS}) -qt4_add_resources(QRC data/data.qrc) +qt5_wrap_cpp(MOC ${HEADERS}) +qt5_add_resources(QRC data/data.qrc) add_executable(clementine-tagreader ${SOURCES} diff --git a/ext/libclementine-common/CMakeLists.txt b/ext/libclementine-common/CMakeLists.txt index db5b4c0aa..13e3c0a73 100644 --- a/ext/libclementine-common/CMakeLists.txt +++ b/ext/libclementine-common/CMakeLists.txt @@ -21,7 +21,7 @@ set(HEADERS core/workerpool.h ) -qt4_wrap_cpp(MOC ${HEADERS}) +qt5_wrap_cpp(MOC ${HEADERS}) add_library(libclementine-common STATIC ${SOURCES} @@ -33,3 +33,5 @@ target_link_libraries(libclementine-common ${TAGLIB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) + +QT5_USE_MODULES(libclementine-common Core Network) diff --git a/ext/libclementine-tagreader/CMakeLists.txt b/ext/libclementine-tagreader/CMakeLists.txt index 52372a16b..ba9e3ff31 100644 --- a/ext/libclementine-tagreader/CMakeLists.txt +++ b/ext/libclementine-tagreader/CMakeLists.txt @@ -27,7 +27,7 @@ optional_source(HAVE_GOOGLE_DRIVE cloudstream.h ) -qt4_wrap_cpp(MOC ${HEADERS}) +qt5_wrap_cpp(MOC ${HEADERS}) protobuf_generate_cpp(PROTO_SOURCES PROTO_HEADERS ${MESSAGES}) diff --git a/gst/moodbar/CMakeLists.txt b/gst/moodbar/CMakeLists.txt index 44c136253..2606c1baa 100644 --- a/gst/moodbar/CMakeLists.txt +++ b/gst/moodbar/CMakeLists.txt @@ -27,3 +27,5 @@ target_link_libraries(gstmoodbar ${GSTREAMER_BASE_LIBRARIES} ${FFTW3_FFTW_LIBRARY} ) + +QT5_USE_MODULES(gstmoodbar Core) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 917db286a..b9cc0d438 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -32,13 +32,13 @@ include_directories(${GLIB_INCLUDE_DIRS}) include_directories(${LIBXML_INCLUDE_DIRS}) include_directories(${GOBJECT_INCLUDE_DIRS}) include_directories(${LIBPROJECTM_INCLUDE_DIRS}) -include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIRS}) +include_directories(${SINGLEAPPLICATION_INCLUDE_DIRS}) include_directories(${QTIOCOMPRESSOR_INCLUDE_DIRS}) include_directories(${QXT_INCLUDE_DIRS}) -include_directories(${ECHONEST_INCLUDE_DIRS}) +include_directories(${ECHONEST5_INCLUDE_DIRS}) include_directories(${SHA2_INCLUDE_DIRS}) include_directories(${CHROMAPRINT_INCLUDE_DIRS}) -include_directories(${MYGPOQT_INCLUDE_DIRS}) +include_directories(${MYGPOQT5_INCLUDE_DIRS}) find_package(OpenGL) include_directories(${OPENGL_INCLUDE_DIR}) @@ -852,7 +852,7 @@ optional_source(HAVE_SPOTIFY_DOWNLOADER HEADERS internet/spotify/spotifyblobdownloader.h INCLUDE_DIRECTORIES - ${QCA_INCLUDE_DIRS} + ${QCA_QT5_INCLUDE_DIRS} ) # Platform specific - OS X @@ -896,39 +896,39 @@ if(HAVE_DBUS) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus) # MPRIS DBUS interfaces - qt4_add_dbus_adaptor(SOURCES + qt5_add_dbus_adaptor(SOURCES dbus/org.freedesktop.MediaPlayer.player.xml core/mpris1.h mpris::Mpris1Player core/mpris_player MprisPlayer) - qt4_add_dbus_adaptor(SOURCES + qt5_add_dbus_adaptor(SOURCES dbus/org.freedesktop.MediaPlayer.root.xml core/mpris1.h mpris::Mpris1Root core/mpris_root MprisRoot) - qt4_add_dbus_adaptor(SOURCES + qt5_add_dbus_adaptor(SOURCES dbus/org.freedesktop.MediaPlayer.tracklist.xml core/mpris1.h mpris::Mpris1TrackList core/mpris_tracklist MprisTrackList) # MPRIS 2.0 DBUS interfaces - qt4_add_dbus_adaptor(SOURCES + qt5_add_dbus_adaptor(SOURCES dbus/org.mpris.MediaPlayer2.Player.xml core/mpris2.h mpris::Mpris2 core/mpris2_player Mpris2Player) - qt4_add_dbus_adaptor(SOURCES + qt5_add_dbus_adaptor(SOURCES dbus/org.mpris.MediaPlayer2.xml core/mpris2.h mpris::Mpris2 core/mpris2_root Mpris2Root) - qt4_add_dbus_adaptor(SOURCES + qt5_add_dbus_adaptor(SOURCES dbus/org.mpris.MediaPlayer2.TrackList.xml core/mpris2.h mpris::Mpris2 core/mpris2_tracklist Mpris2TrackList) # MPRIS 2.1 DBUS interfaces - qt4_add_dbus_adaptor(SOURCES + qt5_add_dbus_adaptor(SOURCES dbus/org.mpris.MediaPlayer2.Playlists.xml core/mpris2.h mpris::Mpris2 core/mpris2_playlists Mpris2Playlists) # org.freedesktop.Notifications DBUS interface - qt4_add_dbus_interface(SOURCES + qt5_add_dbus_interface(SOURCES dbus/org.freedesktop.Notifications.xml dbus/notification) # org.gnome.SettingsDaemon interface - qt4_add_dbus_interface(SOURCES + qt5_add_dbus_interface(SOURCES dbus/org.gnome.SettingsDaemon.MediaKeys.xml dbus/gnomesettingsdaemon) @@ -966,17 +966,17 @@ if(HAVE_DBUS) PROPERTIES NO_NAMESPACE dbus/udisks) set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml PROPERTIES NO_NAMESPACE dbus/udisksdevice) - qt4_add_dbus_interface(SOURCES + qt5_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks.xml dbus/udisks) - qt4_add_dbus_interface(SOURCES + qt5_add_dbus_interface(SOURCES dbus/org.freedesktop.UDisks.Device.xml dbus/udisksdevice) endif(HAVE_DEVICEKIT) # Wiimotedev interface classes if(ENABLE_WIIMOTEDEV) - qt4_add_dbus_interface(SOURCES + qt5_add_dbus_interface(SOURCES dbus/org.wiimotedev.deviceEvents.xml dbus/wiimotedev) endif(ENABLE_WIIMOTEDEV) @@ -1197,9 +1197,10 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h) -qt4_wrap_cpp(MOC ${HEADERS}) -qt4_wrap_ui(UIC ${UI}) -qt4_add_resources(QRC ${RESOURCES}) +qt5_wrap_cpp(MOC ${HEADERS}) +qt5_wrap_ui(UIC ${UI}) +qt5_add_resources(QRC ${RESOURCES}) + add_pot(POT ${CMAKE_CURRENT_SOURCE_DIR}/translations/header @@ -1232,18 +1233,17 @@ target_link_libraries(clementine_lib libclementine-remote ${SHA2_LIBRARIES} ${TAGLIB_LIBRARIES} - ${MYGPOQT_LIBRARIES} + ${MYGPOQT5_LIBRARIES} ${CHROMAPRINT_LIBRARIES} - ${ECHONEST_LIBRARIES} + ${ECHONEST5_LIBRARIES} ${GOBJECT_LIBRARIES} ${GLIB_LIBRARIES} - ${QJSON_LIBRARIES} ${QT_LIBRARIES} ${GSTREAMER_BASE_LIBRARIES} ${GSTREAMER_LIBRARIES} ${GSTREAMER_APP_LIBRARIES} ${GSTREAMER_TAG_LIBRARIES} - ${QTSINGLEAPPLICATION_LIBRARIES} + ${SINGLEAPPLICATION_LIBRARIES} ${QTSINGLECOREAPPLICATION_LIBRARIES} ${QTIOCOMPRESSOR_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} @@ -1297,9 +1297,9 @@ endif(HAVE_BREAKPAD) if(HAVE_SPOTIFY_DOWNLOADER) target_link_libraries(clementine_lib - ${QCA_LIBRARIES} + ${QCA_QT5_LIBRARIES} ) - link_directories(${QCA_LIBRARY_DIRS}) + link_directories(${QCA_QT5_LIBRARY_DIRS}) endif(HAVE_SPOTIFY_DOWNLOADER) if(HAVE_LIBPULSE) @@ -1352,7 +1352,7 @@ if (UNIX AND NOT APPLE) endif () endif () -add_dependencies(clementine_lib qtsingleapplication) +add_dependencies(clementine_lib singleapplication) ############################################################################### diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index f7d0a42ac..7c46c02d2 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -69,7 +69,7 @@ set(TESTUTILS-MOC-HEADERS testobjectdecorators.h ) -qt4_wrap_cpp(TESTUTILS-SOURCES-MOC ${TESTUTILS-MOC-HEADERS}) +qt5_wrap_cpp(TESTUTILS-SOURCES-MOC ${TESTUTILS-MOC-HEADERS}) add_library(test_utils STATIC EXCLUDE_FROM_ALL ${TESTUTILS-SOURCES} ${TESTUTILS-SOURCES-MOC}) target_link_libraries(test_utils ${GMOCK_LIBRARIES} ${QT_LIBRARIES} ${QT_QTTEST_LIBRARY}) @@ -83,7 +83,7 @@ add_custom_target(build_tests ) add_dependencies(test build_tests) -qt4_add_resources(TEST-RESOURCE-SOURCES data/testdata.qrc) +qt5_add_resources(TEST-RESOURCE-SOURCES data/testdata.qrc) add_library(test_gui_main STATIC EXCLUDE_FROM_ALL ${TEST-RESOURCE-SOURCES} main.cpp) target_link_libraries(test_gui_main clementine_lib) diff --git a/tools/ultimate_lyrics_parser/CMakeLists.txt b/tools/ultimate_lyrics_parser/CMakeLists.txt index 7c41e6601..e410d2eb4 100644 --- a/tools/ultimate_lyrics_parser/CMakeLists.txt +++ b/tools/ultimate_lyrics_parser/CMakeLists.txt @@ -4,4 +4,5 @@ set(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}") set(CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wall -Wno-sign-compare ${CMAKE_CXX_FLAGS}") add_executable(ultimate_lyrics_parser EXCLUDE_FROM_ALL main.cpp) -target_link_libraries(ultimate_lyrics_parser ${QT_LIBRARIES}) + +target_link_libraries(ultimate_lyrics_parser Qt5::Core)