diff options
| author | Alex Merry <alex.merry@kde.org> | 2015-10-14 12:18:40 +0100 |
|---|---|---|
| committer | Alex Merry <alex.merry@kde.org> | 2015-11-03 10:22:34 +0000 |
| commit | 009c480413910e8c1a18f4d1420f4a517ea606e6 (patch) | |
| tree | c8a41523992eac3cadcfe18c11b956d84b397c5b /modules/ECMPoQmTools.cmake | |
| parent | fb7b8eea7d91772f989d5b060c86df20f2ebdb66 (diff) | |
| download | extra-cmake-modules-009c480413910e8c1a18f4d1420f4a517ea606e6.tar.gz extra-cmake-modules-009c480413910e8c1a18f4d1420f4a517ea606e6.tar.bz2 | |
Make sure we load translations on the main thread.
BUG: 346188
REVIEW: 123726
Diffstat (limited to 'modules/ECMPoQmTools.cmake')
| -rw-r--r-- | modules/ECMPoQmTools.cmake | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/modules/ECMPoQmTools.cmake b/modules/ECMPoQmTools.cmake index 12bcf6b6..22258dc8 100644 --- a/modules/ECMPoQmTools.cmake +++ b/modules/ECMPoQmTools.cmake @@ -99,9 +99,20 @@ endfunction() function(ecm_create_qm_loader out_var catalog_name) + set(loader_cpp ${CMAKE_CURRENT_BINARY_DIR}/ECMQmLoader.cpp) + set(loader_moc ${CMAKE_CURRENT_BINARY_DIR}/ECMQmLoader.moc) + # catalog_name is used in ECMQmLoader.cpp.in - configure_file(${ECM_MODULE_DIR}/ECMQmLoader.cpp.in ECMQmLoader.cpp @ONLY) - set(${out_var} ${${out_var}} ${CMAKE_CURRENT_BINARY_DIR}/ECMQmLoader.cpp PARENT_SCOPE) + configure_file(${ECM_MODULE_DIR}/ECMQmLoader.cpp.in "${loader_cpp}" @ONLY) + set(${out_var} "${${out_var}}" "${loader_cpp}" "${loader_moc}" PARENT_SCOPE) + + # can't assume target has AUTOMOC turned on + if(NOT Qt5Core_FOUND) + find_package(Qt5Core) + endif() + if(Qt5Core_FOUND) + qt5_generate_moc("${loader_cpp}" "${loader_moc}") + endif() endfunction() |