From 37936496a4d1387a0c4ac5c5298b81ee4472c39b Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Wed, 13 May 2020 23:35:53 +0100 Subject: [PATCH] =?UTF-8?q?CMake=20translations:=20don=E2=80=99t=20break?= =?UTF-8?q?=20no-translation=20builds?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move all the relevant pieces inside the do_translate guard, so we don’t break compilation when translation is disabled. --- CMakeModules/Translations.cmake | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/CMakeModules/Translations.cmake b/CMakeModules/Translations.cmake index caa23d533..7802ad5cf 100644 --- a/CMakeModules/Translations.cmake +++ b/CMakeModules/Translations.cmake @@ -35,10 +35,10 @@ function(translation_dir_list result curdir) set(${result} ${dirlist} PARENT_SCOPE) endfunction() -translation_dir_list(LANGUAGES ${TRANSLATIONS_SRC_DIR}) -message(STATUS "Detected language files: ${LANGUAGES}") - if (${do_translate}) + translation_dir_list(LANGUAGES ${TRANSLATIONS_SRC_DIR}) + message(STATUS "Detected language files: ${LANGUAGES}") + set(translation_res "${PROJECT_BINARY_DIR}/translations.qrc") add_custom_target(fgfs_qm_files ALL) @@ -72,15 +72,17 @@ if (${do_translate}) # set this so config.h can detect it set(HAVE_QRC_TRANSLATIONS TRUE) + + add_custom_target(ts) + + foreach(lang ${LANGUAGES}) + add_custom_target( + ts_${lang} + COMMAND Qt5::lupdate ${CMAKE_SOURCE_DIR}/src/GUI + -locations relative -no-ui-lines -ts ${TRANSLATIONS_SRC_DIR}/${lang}/FlightGear-Qt.xlf + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + ) + add_dependencies(ts ts_${lang}) + endforeach() endif() # of do translate -add_custom_target(ts) -foreach(lang ${LANGUAGES}) - add_custom_target( - ts_${lang} - COMMAND Qt5::lupdate ${CMAKE_SOURCE_DIR}/src/GUI - -locations relative -no-ui-lines -ts ${TRANSLATIONS_SRC_DIR}/${lang}/FlightGear-Qt.xlf - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - ) - add_dependencies(ts ts_${lang}) -endforeach() \ No newline at end of file