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

Update internals CMakeLits to qt5

Browse Source
This commit is contained in:
Chocobozzz 2015-04-11 22:51:40 +02:00
parent 419eb61b54
commit ded70d6555
8 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/clementine-spotifyblob/CMakeLists.txt
View File

@ -28,7 +28,7 @@ if(APPLE)
list(APPEND SOURCES spotify_utilities.mm) list(APPEND SOURCES spotify_utilities.mm)
endif(APPLE) 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) if(WIN32 AND NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT ENABLE_WIN32_CONSOLE)
set(win32_build_flag WIN32) set(win32_build_flag WIN32)

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

@ -16,8 +16,8 @@ set(SOURCES
tagreaderworker.cpp tagreaderworker.cpp
) )
qt4_wrap_cpp(MOC ${HEADERS}) qt5_wrap_cpp(MOC ${HEADERS})
qt4_add_resources(QRC data/data.qrc) qt5_add_resources(QRC data/data.qrc)
add_executable(clementine-tagreader add_executable(clementine-tagreader
${SOURCES} ${SOURCES}

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

@ -21,7 +21,7 @@ set(HEADERS
core/workerpool.h core/workerpool.h
) )
qt4_wrap_cpp(MOC ${HEADERS}) qt5_wrap_cpp(MOC ${HEADERS})
add_library(libclementine-common STATIC add_library(libclementine-common STATIC
${SOURCES} ${SOURCES}
@ -33,3 +33,5 @@ target_link_libraries(libclementine-common
${TAGLIB_LIBRARIES} ${TAGLIB_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
) )
QT5_USE_MODULES(libclementine-common Core Network)

2
ext/libclementine-tagreader/CMakeLists.txt
View File

@ -27,7 +27,7 @@ optional_source(HAVE_GOOGLE_DRIVE
cloudstream.h cloudstream.h
) )
qt4_wrap_cpp(MOC ${HEADERS}) qt5_wrap_cpp(MOC ${HEADERS})
protobuf_generate_cpp(PROTO_SOURCES PROTO_HEADERS ${MESSAGES}) protobuf_generate_cpp(PROTO_SOURCES PROTO_HEADERS ${MESSAGES})

2
gst/moodbar/CMakeLists.txt
View File

@ -27,3 +27,5 @@ target_link_libraries(gstmoodbar
${GSTREAMER_BASE_LIBRARIES} ${GSTREAMER_BASE_LIBRARIES}
${FFTW3_FFTW_LIBRARY} ${FFTW3_FFTW_LIBRARY}
) )
QT5_USE_MODULES(gstmoodbar Core)

52
src/CMakeLists.txt
View File

@ -32,13 +32,13 @@ include_directories(${GLIB_INCLUDE_DIRS})
include_directories(${LIBXML_INCLUDE_DIRS}) include_directories(${LIBXML_INCLUDE_DIRS})
include_directories(${GOBJECT_INCLUDE_DIRS}) include_directories(${GOBJECT_INCLUDE_DIRS})
include_directories(${LIBPROJECTM_INCLUDE_DIRS}) include_directories(${LIBPROJECTM_INCLUDE_DIRS})
include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIRS}) include_directories(${SINGLEAPPLICATION_INCLUDE_DIRS})
include_directories(${QTIOCOMPRESSOR_INCLUDE_DIRS}) include_directories(${QTIOCOMPRESSOR_INCLUDE_DIRS})
include_directories(${QXT_INCLUDE_DIRS}) include_directories(${QXT_INCLUDE_DIRS})
include_directories(${ECHONEST_INCLUDE_DIRS}) include_directories(${ECHONEST5_INCLUDE_DIRS})
include_directories(${SHA2_INCLUDE_DIRS}) include_directories(${SHA2_INCLUDE_DIRS})
include_directories(${CHROMAPRINT_INCLUDE_DIRS}) include_directories(${CHROMAPRINT_INCLUDE_DIRS})
include_directories(${MYGPOQT_INCLUDE_DIRS}) include_directories(${MYGPOQT5_INCLUDE_DIRS})
find_package(OpenGL) find_package(OpenGL)
include_directories(${OPENGL_INCLUDE_DIR}) include_directories(${OPENGL_INCLUDE_DIR})
@ -852,7 +852,7 @@ optional_source(HAVE_SPOTIFY_DOWNLOADER
HEADERS HEADERS
internet/spotify/spotifyblobdownloader.h internet/spotify/spotifyblobdownloader.h
INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES
${QCA_INCLUDE_DIRS} ${QCA_QT5_INCLUDE_DIRS}
) )
# Platform specific - OS X # Platform specific - OS X
@ -896,39 +896,39 @@ if(HAVE_DBUS)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus)
# MPRIS DBUS interfaces # MPRIS DBUS interfaces
qt4_add_dbus_adaptor(SOURCES qt5_add_dbus_adaptor(SOURCES
dbus/org.freedesktop.MediaPlayer.player.xml dbus/org.freedesktop.MediaPlayer.player.xml
core/mpris1.h mpris::Mpris1Player core/mpris_player MprisPlayer) 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 dbus/org.freedesktop.MediaPlayer.root.xml
core/mpris1.h mpris::Mpris1Root core/mpris_root MprisRoot) 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 dbus/org.freedesktop.MediaPlayer.tracklist.xml
core/mpris1.h mpris::Mpris1TrackList core/mpris_tracklist MprisTrackList) core/mpris1.h mpris::Mpris1TrackList core/mpris_tracklist MprisTrackList)
# MPRIS 2.0 DBUS interfaces # MPRIS 2.0 DBUS interfaces
qt4_add_dbus_adaptor(SOURCES qt5_add_dbus_adaptor(SOURCES
dbus/org.mpris.MediaPlayer2.Player.xml dbus/org.mpris.MediaPlayer2.Player.xml
core/mpris2.h mpris::Mpris2 core/mpris2_player Mpris2Player) core/mpris2.h mpris::Mpris2 core/mpris2_player Mpris2Player)
qt4_add_dbus_adaptor(SOURCES qt5_add_dbus_adaptor(SOURCES
dbus/org.mpris.MediaPlayer2.xml dbus/org.mpris.MediaPlayer2.xml
core/mpris2.h mpris::Mpris2 core/mpris2_root Mpris2Root) 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 dbus/org.mpris.MediaPlayer2.TrackList.xml
core/mpris2.h mpris::Mpris2 core/mpris2_tracklist Mpris2TrackList) core/mpris2.h mpris::Mpris2 core/mpris2_tracklist Mpris2TrackList)
# MPRIS 2.1 DBUS interfaces # MPRIS 2.1 DBUS interfaces
qt4_add_dbus_adaptor(SOURCES qt5_add_dbus_adaptor(SOURCES
dbus/org.mpris.MediaPlayer2.Playlists.xml dbus/org.mpris.MediaPlayer2.Playlists.xml
core/mpris2.h mpris::Mpris2 core/mpris2_playlists Mpris2Playlists) core/mpris2.h mpris::Mpris2 core/mpris2_playlists Mpris2Playlists)
# org.freedesktop.Notifications DBUS interface # org.freedesktop.Notifications DBUS interface
qt4_add_dbus_interface(SOURCES qt5_add_dbus_interface(SOURCES
dbus/org.freedesktop.Notifications.xml dbus/org.freedesktop.Notifications.xml
dbus/notification) dbus/notification)
# org.gnome.SettingsDaemon interface # org.gnome.SettingsDaemon interface
qt4_add_dbus_interface(SOURCES qt5_add_dbus_interface(SOURCES
dbus/org.gnome.SettingsDaemon.MediaKeys.xml dbus/org.gnome.SettingsDaemon.MediaKeys.xml
dbus/gnomesettingsdaemon) dbus/gnomesettingsdaemon)
@ -966,17 +966,17 @@ if(HAVE_DBUS)
PROPERTIES NO_NAMESPACE dbus/udisks) PROPERTIES NO_NAMESPACE dbus/udisks)
set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml
PROPERTIES NO_NAMESPACE dbus/udisksdevice) PROPERTIES NO_NAMESPACE dbus/udisksdevice)
qt4_add_dbus_interface(SOURCES qt5_add_dbus_interface(SOURCES
dbus/org.freedesktop.UDisks.xml dbus/org.freedesktop.UDisks.xml
dbus/udisks) dbus/udisks)
qt4_add_dbus_interface(SOURCES qt5_add_dbus_interface(SOURCES
dbus/org.freedesktop.UDisks.Device.xml dbus/org.freedesktop.UDisks.Device.xml
dbus/udisksdevice) dbus/udisksdevice)
endif(HAVE_DEVICEKIT) endif(HAVE_DEVICEKIT)
# Wiimotedev interface classes # Wiimotedev interface classes
if(ENABLE_WIIMOTEDEV) if(ENABLE_WIIMOTEDEV)
qt4_add_dbus_interface(SOURCES qt5_add_dbus_interface(SOURCES
dbus/org.wiimotedev.deviceEvents.xml dbus/org.wiimotedev.deviceEvents.xml
dbus/wiimotedev) dbus/wiimotedev)
endif(ENABLE_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 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in
${CMAKE_CURRENT_BINARY_DIR}/version.h) ${CMAKE_CURRENT_BINARY_DIR}/version.h)
qt4_wrap_cpp(MOC ${HEADERS}) qt5_wrap_cpp(MOC ${HEADERS})
qt4_wrap_ui(UIC ${UI}) qt5_wrap_ui(UIC ${UI})
qt4_add_resources(QRC ${RESOURCES}) qt5_add_resources(QRC ${RESOURCES})
add_pot(POT add_pot(POT
${CMAKE_CURRENT_SOURCE_DIR}/translations/header ${CMAKE_CURRENT_SOURCE_DIR}/translations/header
@ -1232,18 +1233,17 @@ target_link_libraries(clementine_lib
libclementine-remote libclementine-remote
${SHA2_LIBRARIES} ${SHA2_LIBRARIES}
${TAGLIB_LIBRARIES} ${TAGLIB_LIBRARIES}
${MYGPOQT_LIBRARIES} ${MYGPOQT5_LIBRARIES}
${CHROMAPRINT_LIBRARIES} ${CHROMAPRINT_LIBRARIES}
${ECHONEST_LIBRARIES} ${ECHONEST5_LIBRARIES}
${GOBJECT_LIBRARIES} ${GOBJECT_LIBRARIES}
${GLIB_LIBRARIES} ${GLIB_LIBRARIES}
${QJSON_LIBRARIES}
${QT_LIBRARIES} ${QT_LIBRARIES}
${GSTREAMER_BASE_LIBRARIES} ${GSTREAMER_BASE_LIBRARIES}
${GSTREAMER_LIBRARIES} ${GSTREAMER_LIBRARIES}
${GSTREAMER_APP_LIBRARIES} ${GSTREAMER_APP_LIBRARIES}
${GSTREAMER_TAG_LIBRARIES} ${GSTREAMER_TAG_LIBRARIES}
${QTSINGLEAPPLICATION_LIBRARIES} ${SINGLEAPPLICATION_LIBRARIES}
${QTSINGLECOREAPPLICATION_LIBRARIES} ${QTSINGLECOREAPPLICATION_LIBRARIES}
${QTIOCOMPRESSOR_LIBRARIES} ${QTIOCOMPRESSOR_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
@ -1297,9 +1297,9 @@ endif(HAVE_BREAKPAD)
if(HAVE_SPOTIFY_DOWNLOADER) if(HAVE_SPOTIFY_DOWNLOADER)
target_link_libraries(clementine_lib 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) endif(HAVE_SPOTIFY_DOWNLOADER)
if(HAVE_LIBPULSE) if(HAVE_LIBPULSE)
@ -1352,7 +1352,7 @@ if (UNIX AND NOT APPLE)
endif () endif ()
endif () endif ()
add_dependencies(clementine_lib qtsingleapplication) add_dependencies(clementine_lib singleapplication)
############################################################################### ###############################################################################

4
tests/CMakeLists.txt
View File

@ -69,7 +69,7 @@ set(TESTUTILS-MOC-HEADERS
testobjectdecorators.h 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}) 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}) 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) 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) add_library(test_gui_main STATIC EXCLUDE_FROM_ALL ${TEST-RESOURCE-SOURCES} main.cpp)
target_link_libraries(test_gui_main clementine_lib) target_link_libraries(test_gui_main clementine_lib)

3
tools/ultimate_lyrics_parser/CMakeLists.txt
View File

@ -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}") set(CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wall -Wno-sign-compare ${CMAKE_CXX_FLAGS}")
add_executable(ultimate_lyrics_parser EXCLUDE_FROM_ALL main.cpp) 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)