second works. :) On Thu, Apr 9, 2015 at 3:47 PM, Thiago Macieira <[email protected]> wrote:
> On Thursday 09 April 2015 15:13:10 Tomaz Canabrava wrote: > > This should work dirk, > > If you apply and it doesn't works, try to remove the CMakeCache file and > > run cmake again. > > The first patch looks fine. The second I can't comment on. > -- > Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org > Software Architect - Intel Open Source Technology Center > PGP/GPG: 0x6EF45358; fingerprint: > E067 918B B660 DBD1 105C 966C 33F5 F005 6EF4 5358 > > _______________________________________________ > subsurface mailing list > [email protected] > http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface >
From 1405506ac6a9a6f3c4334d464484c1923eb1ed20 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava <[email protected]> Date: Thu, 9 Apr 2015 15:50:06 -0300 Subject: [PATCH 3/3] Move the translations to it's own subfolder By adding a new CMakeLists.txt file and configuring the translations inside of it's folder, the buildsystem will compile everything on that folder. Signed-off-by: Tomaz Canabrava <[email protected]> --- CMakeLists.txt | 37 +++---------------------------------- translations/CMakeLists.txt | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 34 deletions(-) create mode 100644 translations/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 44fb7f2..acb0787 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -155,6 +155,9 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "Windows") endif() ENDIF() +# include translations +add_subdirectory(translations) + # compile the core library, in C. SET(SUBSURFACE_CORE_LIB_SRCS @@ -357,32 +360,6 @@ set(DOCFILES ${CMAKE_BINARY_DIR}/Documentation/user-manual_ru.html ) -QT5_ADD_TRANSLATION(TRANSLATIONS - translations/subsurface_source.ts - translations/subsurface_bg_BG.ts - translations/subsurface_cs.ts - translations/subsurface_da_DK.ts - translations/subsurface_de_CH.ts - translations/subsurface_de_DE.ts - translations/subsurface_en_GB.ts - translations/subsurface_es_ES.ts - translations/subsurface_et_EE.ts - translations/subsurface_fi_FI.ts - translations/subsurface_fr_FR.ts - translations/subsurface_it_IT.ts - translations/subsurface_lv_LV.ts - translations/subsurface_nb_NO.ts - translations/subsurface_nl_NL.ts - translations/subsurface_pl_PL.ts - translations/subsurface_pt_BR.ts - translations/subsurface_pt_PT.ts - translations/subsurface_ru_RU.ts - translations/subsurface_sk_SK.ts - translations/subsurface_sv_SE.ts - translations/subsurface_tr.ts - translations/subsurface_zh_TW.ts -) - set(QTTRANSLATIONS_BASE qt_da.qm qt_de.qm @@ -398,14 +375,6 @@ set(QTTRANSLATIONS_BASE qt_zh_TW.qm ) -# disabled translations as they are below 50%: -# translations/subsurface_el_GR.ts \ -# translations/subsurface_he.ts \ -# translations/subsurface_hu.ts \ -# translations/subsurface_ro_RO.ts \ - -ADD_CUSTOM_TARGET (translations ALL DEPENDS ${TRANSLATIONS}) - if(QT_TRANSLATION_DIR STREQUAL "") set(QT_TRANSLATION_DIR ${Qt5Core_DIR}/../../../translations) endif() diff --git a/translations/CMakeLists.txt b/translations/CMakeLists.txt new file mode 100644 index 0000000..71ffa6d --- /dev/null +++ b/translations/CMakeLists.txt @@ -0,0 +1,34 @@ +QT5_ADD_TRANSLATION(TRANSLATIONS + subsurface_source.ts + subsurface_bg_BG.ts + subsurface_cs.ts + subsurface_da_DK.ts + subsurface_de_CH.ts + subsurface_de_DE.ts + subsurface_en_GB.ts + subsurface_es_ES.ts + subsurface_et_EE.ts + subsurface_fi_FI.ts + subsurface_fr_FR.ts + subsurface_it_IT.ts + subsurface_lv_LV.ts + subsurface_nb_NO.ts + subsurface_nl_NL.ts + subsurface_pl_PL.ts + subsurface_pt_BR.ts + subsurface_pt_PT.ts + subsurface_ru_RU.ts + subsurface_sk_SK.ts + subsurface_sv_SE.ts + subsurface_tr.ts + subsurface_zh_TW.ts +) + +# disabled translations as they are below 50%: +# translations/subsurface_el_GR.ts \ +# translations/subsurface_he.ts \ +# translations/subsurface_hu.ts \ +# translations/subsurface_ro_RO.ts \ + +SET(TRANSLATIONS ${TRANSLATIONS} PARENT_SCOPE) +ADD_CUSTOM_TARGET (translations ALL DEPENDS ${TRANSLATIONS}) -- 2.3.5
_______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
