Fix translations for Qt 6

This commit is contained in:
Jonas Kvinge 2020-07-30 20:49:24 +02:00
parent 2d5a6d6583
commit f22133c3c5
2 changed files with 17 additions and 6 deletions

View File

@ -338,10 +338,17 @@ optional_component(SPARKLE ON "Sparkle integration"
DEPENDS "Sparkle" SPARKLE DEPENDS "Sparkle" SPARKLE
) )
optional_component(TRANSLATIONS ON "Translations" if(WITH_QT6)
DEPENDS "gettext" GETTEXT_FOUND optional_component(TRANSLATIONS ON "Translations"
DEPENDS "Qt5LinguistTools" Qt5LinguistTools_FOUND DEPENDS "gettext" GETTEXT_FOUND
) DEPENDS "Qt6LinguistTools" Qt6LinguistTools_FOUND
)
else()
optional_component(TRANSLATIONS ON "Translations"
DEPENDS "gettext" GETTEXT_FOUND
DEPENDS "Qt5LinguistTools" Qt5LinguistTools_FOUND
)
endif()
optional_component(SUBSONIC ON "Subsonic support") optional_component(SUBSONIC ON "Subsonic support")
optional_component(TIDAL ON "Tidal support") optional_component(TIDAL ON "Tidal support")

View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 3.0)
find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext) find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
if(NOT GETTEXT_XGETTEXT_EXECUTABLE) if(NOT GETTEXT_XGETTEXT_EXECUTABLE)
@ -73,5 +73,9 @@ 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>")
qt5_add_resources(${outfiles} ${_qrc}) if(WITH_QT6)
qt6_add_resources(${outfiles} ${_qrc})
else()
qt5_add_resources(${outfiles} ${_qrc})
endif()
endmacro(add_po) endmacro(add_po)