diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-09-07 06:49:12 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-09-07 11:25:12 +0000 |
| commit | f091ed83f7e051f0618391dc791687235c4a0abd (patch) | |
| tree | 602c7c13edcf7efdd870f9fd22a4f28fd13ca4d4 /ui | |
| parent | 09a9d2265595ca317136c85975da318ef29f84c6 (diff) | |
CMake: Try to fix build error with i18n.qrc dependency order
Change-Id: I7006b435508e72457413cd1b7c5bdf1b7b41ee5b
Reviewed-on: https://code.wireshark.org/review/23424
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/CMakeLists.txt | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt index 3fb1090629..596ef02818 100644 --- a/ui/qt/CMakeLists.txt +++ b/ui/qt/CMakeLists.txt @@ -521,15 +521,6 @@ if(ENABLE_EXTCAP) ) endif() -set(WIRESHARK_QT_QRC - ../../image/about.qrc - ../../image/languages/languages.qrc - ../../image/layout.qrc - ../../image/toolbar.qrc - ../../image/wsicon.qrc - ${CMAKE_CURRENT_BINARY_DIR}/i18n.qrc -) - set(WIRESHARK_QT_TS wireshark_de.ts wireshark_en.ts # lupdate -pluralonly @@ -540,6 +531,23 @@ set(WIRESHARK_QT_TS wireshark_zh_CN.ts ) +foreach(_file ${WIRESHARK_QT_TS}) + get_filename_component(_qresource ${_file} NAME_WE) + set(_qresource_qm "${_qresource}.qm") + set(i18n_qresource "${i18n_qresource}\n <file>${_qresource_qm}</file>") + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/i18n.qrc PROPERTIES OBJECT_DEPENDS ${_qresource_qm}) +endforeach() +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/i18n.qrc.in ${CMAKE_CURRENT_BINARY_DIR}/i18n.qrc) + +set(WIRESHARK_QT_QRC + ../../image/about.qrc + ../../image/languages/languages.qrc + ../../image/layout.qrc + ../../image/toolbar.qrc + ../../image/wsicon.qrc + ${CMAKE_CURRENT_BINARY_DIR}/i18n.qrc +) + include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} @@ -557,13 +565,6 @@ else() QT4_WRAP_UI(WIRESHARK_QT_UI_SRC ${WIRESHARK_QT_UI}) endif() -foreach(_file ${WIRESHARK_QT_QM}) - get_filename_component(_qresource ${_file} NAME) - set(i18n_qresource "${i18n_qresource}\n <file>${_qresource}</file>") - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/i18n.qrc PROPERTIES OBJECT_DEPENDS ${_file}) -endforeach() -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/i18n.qrc.in ${CMAKE_CURRENT_BINARY_DIR}/i18n.qrc) - add_custom_target( translations ALL DEPENDS |