From 6bbbb5337da8dab61c17d5775b0c936d2e266c98 Mon Sep 17 00:00:00 2001 From: Christian Hohnstaedt Date: Sat, 24 Aug 2024 14:52:44 +0200 Subject: [PATCH] 2nd Fixup for a548227a073: install QT translation files again QT provided QM files in QM_FILES got overwritten by the invokation of the translation function. Put them into a different variable. --- lang/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt index a80d3fc9..9cdf82a9 100644 --- a/lang/CMakeLists.txt +++ b/lang/CMakeLists.txt @@ -13,7 +13,7 @@ foreach(lang ${XCA_LANGUAGES}) set(LANG_COMPS " \n") if(EXISTS ${_qt_bin_dir}/../translations/qt_${lang}.qm) - list(APPEND QM_FILES ${_qt_bin_dir}/../translations/qt_${lang}.qm) + list(APPEND QT_QM_FILES ${_qt_bin_dir}/../translations/qt_${lang}.qm) string(APPEND LANG_COMPS " \n") endif() string(APPEND LANG_COMPS " \n") @@ -43,15 +43,15 @@ else() ) add_custom_target(trans DEPENDS xca_lupdate "${D}/xca.pot") endif() -list(APPEND APP_RESOURCES ${QM_FILES} ${LANG_DIRS}) -target_sources(${CMAKE_PROJECT_NAME} PRIVATE ${QM_FILES}) +list(APPEND APP_RESOURCES ${QM_FILES} ${QT_QM_FILES} ${LANG_DIRS}) +target_sources(${CMAKE_PROJECT_NAME} PRIVATE ${QM_FILES} ${QT_QM_FILES}) if (UNIX AND NOT APPLE) install(FILES ${QM_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/i18n ) elseif(WIN32) - install(FILES ${QM_FILES} + install(FILES ${QM_FILES} ${QT_QM_FILES} DESTINATION ${RUNTIME_DEST}/i18n ) endif()