diff --git a/CMakeLists.txt b/CMakeLists.txt index d64aa2c6..60cbe6ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -633,10 +633,13 @@ if (NOT APPLE AND NOT WIN32) endif() # -# Bundle translations. +# Bundle resources # -include(Translations) -set(TRANSLATION_DEPS ${LANG_QRC} ${QRC} ${QM_SRC}) +if(Qt6QuickCompiler_FOUND AND COMPILE_QML) + qtquick_compiler_add_resources(QRC resources/res.qrc) +else() + qt_add_resources(QRC resources/res.qrc) +endif() if (APPLE) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Foundation -framework Cocoa -framework UserNotifications") @@ -668,7 +671,7 @@ endif () set(NHEKO_DEPS ${SRC_FILES} - ${TRANSLATION_DEPS} + ${QRC} ${META_FILES_TO_INCLUDE}) if(ASAN) @@ -691,6 +694,12 @@ set_target_properties(nheko CMAKE_SKIP_INSTALL_RPATH TRUE AUTOMOC ON) +# +# Bundle translations +# +file(GLOB LANG_TS_SRC "${CMAKE_CURRENT_SOURCE_DIR}/resources/langs/*.ts") +qt_add_translations(nheko RESOURCE_PREFIX "/translations" TS_FILES ${LANG_TS_SRC}) + if(WIN32) target_compile_definitions(nheko PRIVATE WIN32_LEAN_AND_MEAN) if(MSVC) diff --git a/cmake/Translations.cmake b/cmake/Translations.cmake deleted file mode 100644 index 9422570d..00000000 --- a/cmake/Translations.cmake +++ /dev/null @@ -1,28 +0,0 @@ -# -# Generate the translation resource file -# - -file(GLOB LANG_TS_SRC "${CMAKE_CURRENT_SOURCE_DIR}/resources/langs/*.ts") - -qt_add_translation(QM_SRC ${LANG_TS_SRC}) -qt_create_translation(${QM_SRC}) -add_custom_target(LANG_QRC ALL DEPENDS ${QM_SRC}) - -# Generate a qrc file for the translations -set(_qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc) - -if(NOT EXISTS ${_qrc}) - file(WRITE ${_qrc} "\n \n") - foreach(_lang ${QM_SRC}) - get_filename_component(_filename ${_lang} NAME) - file(APPEND ${_qrc} " ${_filename}\n") - endforeach(_lang) - file(APPEND ${_qrc} " \n\n") -endif() - -qt_add_resources(LANG_QRC ${_qrc}) -if(Qt5QuickCompiler_FOUND AND COMPILE_QML) - qtquick_compiler_add_resources(QRC resources/res.qrc) -else() - qt_add_resources(QRC resources/res.qrc) -endif()