Skip to content

Commit

Permalink
2nd Fixup for a548227: install QT translation files again
Browse files Browse the repository at this point in the history
QT provided QM files in QM_FILES got overwritten by the
invokation of the translation function.
Put them into a different variable.
  • Loading branch information
chris2511 committed Aug 24, 2024
1 parent 79fb4eb commit 6bbbb53
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lang/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ foreach(lang ${XCA_LANGUAGES})
set(LANG_COMPS " <Component Id=\"Ci18n.${lang}\" Guid=\"${GUID}\">
<File Id=\"xca_${lang}.qm\" Source=\"${D}/xca_${lang}.qm\" KeyPath=\"yes\"/>\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 " <File Id=\"qt_${lang}.qm\" Source=\"${_qt_bin_dir}/../translations/qt_${lang}.qm\"/>\n")
endif()
string(APPEND LANG_COMPS " </Component>\n")
Expand Down Expand Up @@ -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()
Expand Down

0 comments on commit 6bbbb53

Please sign in to comment.