Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change Qt 5/6 option

Browse Source
This commit is contained in:
Jonas Kvinge 2020-10-01 19:43:39 +02:00
parent 8f9dbfee2c
commit ae6a50626d
11 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ccpp.yml vendored
View File

@ -367,7 +367,7 @@ jobs:
- name: Configure CMake - name: Configure CMake
shell: bash shell: bash
working-directory: build working-directory: build
run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DWITH_QT6=ON run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_WITH_QT6=ON
- name: Build - name: Build
working-directory: build working-directory: build
run: cmake --build . --config $BUILD_TYPE run: cmake --build . --config $BUILD_TYPE

4
3rdparty/singleapplication/CMakeLists.txt vendored
View File

@ -10,7 +10,7 @@ endif()
set(SINGLEAPP-SOURCES singleapplication.cpp singleapplication_p.cpp) set(SINGLEAPP-SOURCES singleapplication.cpp singleapplication_p.cpp)
set(SINGLEAPP-MOC-HEADERS singleapplication.h singleapplication_p.h) set(SINGLEAPP-MOC-HEADERS singleapplication.h singleapplication_p.h)
if(WITH_QT6) if(BUILD_WITH_QT6)
qt6_wrap_cpp(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS}) qt6_wrap_cpp(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS})
else() else()
qt5_wrap_cpp(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS}) qt5_wrap_cpp(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS})
@ -33,7 +33,7 @@ target_link_libraries(singleapplication PRIVATE
set(SINGLECOREAPP-SOURCES singlecoreapplication.cpp singlecoreapplication_p.cpp) set(SINGLECOREAPP-SOURCES singlecoreapplication.cpp singlecoreapplication_p.cpp)
set(SINGLECOREAPP-MOC-HEADERS singlecoreapplication.h singlecoreapplication_p.h) set(SINGLECOREAPP-MOC-HEADERS singlecoreapplication.h singlecoreapplication_p.h)
if(WITH_QT6) if(BUILD_WITH_QT6)
qt6_wrap_cpp(SINGLECOREAPP-SOURCES-MOC ${SINGLECOREAPP-MOC-HEADERS}) qt6_wrap_cpp(SINGLECOREAPP-SOURCES-MOC ${SINGLECOREAPP-MOC-HEADERS})
else() else()
qt5_wrap_cpp(SINGLECOREAPP-SOURCES-MOC ${SINGLECOREAPP-MOC-HEADERS}) qt5_wrap_cpp(SINGLECOREAPP-SOURCES-MOC ${SINGLECOREAPP-MOC-HEADERS})

22
CMakeLists.txt
View File

@ -133,7 +133,17 @@ pkg_check_modules(GDK_PIXBUF gdk-pixbuf-2.0)
find_package(Gettext) find_package(Gettext)
find_package(FFTW3) find_package(FFTW3)
option(WITH_QT6 "Use Qt 6" OFF) option(BUILD_WITH_QT5 "Use Qt 5" OFF)
option(BUILD_WITH_QT6 "Use Qt 6" OFF)
if(WITH_QT6)
set(BUILD_WITH_QT6 ON)
endif()
if(NOT BUILD_WITH_QT5 AND NOT BUILD_WITH_QT6)
set(BUILD_WITH_QT5 ON)
endif()
set(QT_COMPONENTS Core Concurrent Widgets Network Sql) set(QT_COMPONENTS Core Concurrent Widgets Network Sql)
if(X11_FOUND) if(X11_FOUND)
list(APPEND QT_COMPONENTS X11Extras) list(APPEND QT_COMPONENTS X11Extras)
@ -148,7 +158,7 @@ if(WIN32)
list(APPEND QT_COMPONENTS WinExtras) list(APPEND QT_COMPONENTS WinExtras)
endif() endif()
if(WITH_QT6) if(BUILD_WITH_QT6)
list(APPEND QT_COMPONENTS Core5Compat) list(APPEND QT_COMPONENTS Core5Compat)
find_package(Qt6 REQUIRED COMPONENTS ${QT_COMPONENTS}) find_package(Qt6 REQUIRED COMPONENTS ${QT_COMPONENTS})
set(QtCore_LIBRARIES Qt6::Core) set(QtCore_LIBRARIES Qt6::Core)
@ -178,7 +188,7 @@ if(WITH_QT6)
if (Qt6LinguistTools_FOUND) if (Qt6LinguistTools_FOUND)
set(QT_LCONVERT_EXECUTABLE Qt6::lconvert) set(QT_LCONVERT_EXECUTABLE Qt6::lconvert)
endif() endif()
else() elseif(BUILD_WITH_QT5)
set(QT_MIN_VERSION 5.8) set(QT_MIN_VERSION 5.8)
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS ${QT_COMPONENTS}) find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS ${QT_COMPONENTS})
set(QtCore_LIBRARIES ${Qt5Core_LIBRARIES}) set(QtCore_LIBRARIES ${Qt5Core_LIBRARIES})
@ -213,6 +223,8 @@ else()
if (Qt5LinguistTools_FOUND) if (Qt5LinguistTools_FOUND)
set(QT_LCONVERT_EXECUTABLE Qt5::lconvert) set(QT_LCONVERT_EXECUTABLE Qt5::lconvert)
endif() endif()
else()
message(FATAL_ERROR "Set BUILD_WITH_QT5 or BUILD_WITH_QT6")
endif() endif()
if(X11_FOUND) if(X11_FOUND)
@ -265,7 +277,7 @@ if(APPLE)
endif(APPLE) endif(APPLE)
if(NOT SPARKLE AND (APPLE OR WIN32)) if(NOT SPARKLE AND (APPLE OR WIN32))
if(WITH_QT6) if(BUILD_WITH_QT6)
pkg_check_modules(QTSPARKLE qtsparkle-qt6) pkg_check_modules(QTSPARKLE qtsparkle-qt6)
else() else()
pkg_check_modules(QTSPARKLE qtsparkle-qt5) pkg_check_modules(QTSPARKLE qtsparkle-qt5)
@ -351,7 +363,7 @@ optional_component(SPARKLE ON "Sparkle integration"
DEPENDS "Sparkle" SPARKLE DEPENDS "Sparkle" SPARKLE
) )
if(WITH_QT6) if(BUILD_WITH_QT6)
optional_component(TRANSLATIONS ON "Translations" optional_component(TRANSLATIONS ON "Translations"
DEPENDS "gettext" GETTEXT_FOUND DEPENDS "gettext" GETTEXT_FOUND
DEPENDS "Qt6LinguistTools" Qt6LinguistTools_FOUND DEPENDS "Qt6LinguistTools" Qt6LinguistTools_FOUND

2
cmake/OptionalSource.cmake
View File

@ -15,7 +15,7 @@ macro(optional_source TOGGLE)
list(APPEND OTHER_SOURCES ${OPTIONAL_SOURCE_HEADERS}) list(APPEND OTHER_SOURCES ${OPTIONAL_SOURCE_HEADERS})
set(_uic_sources) set(_uic_sources)
if(WITH_QT6) if(BUILD_WITH_QT6)
qt6_wrap_ui(_uic_sources ${OPTIONAL_SOURCE_UI}) qt6_wrap_ui(_uic_sources ${OPTIONAL_SOURCE_UI})
else() else()
qt5_wrap_ui(_uic_sources ${OPTIONAL_SOURCE_UI}) qt5_wrap_ui(_uic_sources ${OPTIONAL_SOURCE_UI})

2
cmake/Translations.cmake
View File

@ -77,7 +77,7 @@ macro(add_po outfiles po_prefix)
file(APPEND ${_qrc} "<file>${po_prefix}${_lang}.qm</file>") file(APPEND ${_qrc} "<file>${po_prefix}${_lang}.qm</file>")
endforeach(_lang) endforeach(_lang)
file(APPEND ${_qrc} "</qresource></RCC>") file(APPEND ${_qrc} "</qresource></RCC>")
if(WITH_QT6) if(BUILD_WITH_QT6)
qt6_add_resources(${outfiles} ${_qrc}) qt6_add_resources(${outfiles} ${_qrc})
else() else()
qt5_add_resources(${outfiles} ${_qrc}) qt5_add_resources(${outfiles} ${_qrc})

2
dist/windows/strawberry.nsi.in vendored
View File

@ -18,7 +18,7 @@
!define debug !define debug
!endif !endif
!if "@WITH_QT6@" == "ON" !if "@BUILD_WITH_QT6@" == "ON"
!define with_qt6 !define with_qt6
!endif !endif

2
ext/libstrawberry-common/CMakeLists.txt
View File

@ -20,7 +20,7 @@ if(APPLE)
list(APPEND SOURCES core/scoped_nsautorelease_pool.mm) list(APPEND SOURCES core/scoped_nsautorelease_pool.mm)
endif(APPLE) endif(APPLE)
if(WITH_QT6) if(BUILD_WITH_QT6)
qt6_wrap_cpp(MOC ${HEADERS}) qt6_wrap_cpp(MOC ${HEADERS})
else() else()
qt5_wrap_cpp(MOC ${HEADERS}) qt5_wrap_cpp(MOC ${HEADERS})

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

@ -39,6 +39,6 @@ target_link_libraries(libstrawberry-tagreader PRIVATE
libstrawberry-common libstrawberry-common
) )
if(WITH_QT6) if(BUILD_WITH_QT6)
target_link_libraries(libstrawberry-tagreader PRIVATE Qt6::Core5Compat) target_link_libraries(libstrawberry-tagreader PRIVATE Qt6::Core5Compat)
endif() endif()

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

@ -4,7 +4,7 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
set(SOURCES main.cpp tagreaderworker.cpp) set(SOURCES main.cpp tagreaderworker.cpp)
if(WITH_QT6) if(BUILD_WITH_QT6)
qt6_wrap_cpp(MOC ${HEADERS}) qt6_wrap_cpp(MOC ${HEADERS})
qt6_add_resources(QRC data/data.qrc) qt6_add_resources(QRC data/data.qrc)
else() else()

6
src/CMakeLists.txt
View File

@ -607,7 +607,7 @@ if(UNIX AND HAVE_DBUS)
HEADERS device/udisks2lister.h HEADERS device/udisks2lister.h
) )
if (WITH_QT6) if (Qt6Core_FOUND)
# MPRIS 2.0 DBUS interfaces # MPRIS 2.0 DBUS interfaces
qt6_add_dbus_adaptor(SOURCES qt6_add_dbus_adaptor(SOURCES
@ -704,7 +704,7 @@ if(UNIX AND HAVE_DBUS)
PROPERTIES NO_NAMESPACE dbus/udisks2drive INCLUDE dbus/metatypes.h) PROPERTIES NO_NAMESPACE dbus/udisks2drive INCLUDE dbus/metatypes.h)
set_source_files_properties(dbus/org.freedesktop.UDisks2.Job.xml set_source_files_properties(dbus/org.freedesktop.UDisks2.Job.xml
PROPERTIES NO_NAMESPACE dbus/udisks2job INCLUDE dbus/metatypes.h) PROPERTIES NO_NAMESPACE dbus/udisks2job INCLUDE dbus/metatypes.h)
if(WITH_QT6) if(Qt6Core_FOUND)
qt6_add_dbus_interface(SOURCES qt6_add_dbus_interface(SOURCES
dbus/org.freedesktop.DBus.ObjectManager.xml dbus/org.freedesktop.DBus.ObjectManager.xml
dbus/objectmanager) dbus/objectmanager)
@ -987,7 +987,7 @@ optional_source(HAVE_MOODBAR
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
if(WITH_QT6) if(Qt6Core_FOUND)
qt6_wrap_cpp(MOC ${HEADERS}) qt6_wrap_cpp(MOC ${HEADERS})
qt6_wrap_ui(UIC ${UI}) qt6_wrap_ui(UIC ${UI})
qt6_add_resources(QRC ${RESOURCES}) qt6_add_resources(QRC ${RESOURCES})

6
tests/CMakeLists.txt
View File

@ -1,6 +1,6 @@
enable_testing() enable_testing()
if(WITH_QT6) if(BUILD_WITH_QT6)
find_package(Qt6 COMPONENTS Test REQUIRED) find_package(Qt6 COMPONENTS Test REQUIRED)
set(QtTest_LIBRARIES Qt6::Test) set(QtTest_LIBRARIES Qt6::Test)
else() else()
@ -22,7 +22,7 @@ set(TESTUTILS-SOURCES
set(TESTUTILS-MOC-HEADERS src/mock_networkaccessmanager.h src/test_utils.h src/testobjectdecorators.h) set(TESTUTILS-MOC-HEADERS src/mock_networkaccessmanager.h src/test_utils.h src/testobjectdecorators.h)
if(WITH_QT6) if(BUILD_WITH_QT6)
qt6_wrap_cpp(TESTUTILS-SOURCES-MOC ${TESTUTILS-MOC-HEADERS}) qt6_wrap_cpp(TESTUTILS-SOURCES-MOC ${TESTUTILS-MOC-HEADERS})
else() else()
qt5_wrap_cpp(TESTUTILS-SOURCES-MOC ${TESTUTILS-MOC-HEADERS}) qt5_wrap_cpp(TESTUTILS-SOURCES-MOC ${TESTUTILS-MOC-HEADERS})
@ -82,7 +82,7 @@ add_custom_target(strawberry_tests echo "Running Strawberry tests" WORKING_DIREC
add_custom_target(build_tests WORKING_DIRECTORY ${CURRENT_BINARY_DIR}) add_custom_target(build_tests WORKING_DIRECTORY ${CURRENT_BINARY_DIR})
add_dependencies(strawberry_tests build_tests) add_dependencies(strawberry_tests build_tests)
if(WITH_QT6) if(BUILD_WITH_QT6)
qt6_add_resources(TEST-RESOURCE-SOURCES data/testdata.qrc) qt6_add_resources(TEST-RESOURCE-SOURCES data/testdata.qrc)
else() else()
qt5_add_resources(TEST-RESOURCE-SOURCES data/testdata.qrc) qt5_add_resources(TEST-RESOURCE-SOURCES data/testdata.qrc)