From 46cffb0b6c912a4382c9573bc2ea8b2780e91ef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Pereira?= Date: Wed, 1 Mar 2017 16:56:01 +0000 Subject: [PATCH] Improve lxqt_translate_ts() use Uses the INSTALL_DIR, COMPONENT and sources. Add the UPDATE_TRANSLATIONS option. --- CMakeLists.txt | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 794122e..7e17f95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,7 @@ include(CheckFunctionExists) set(LXQTBT_MINIMUM_VERSION "0.3.0") +option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF) option(BUILD_EXAMPLE "Build example application. Default OFF." OFF) # just change version for releases set(QTERMWIDGET_VERSION_MAJOR "0") @@ -32,18 +33,6 @@ find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED) include(LXQtTranslateTs) include(LXQtCompilerSettings NO_POLICY_SCOPE) -lxqt_translate_ts(QTERMWIDGET_QM - TRANSLATION_DIR "lib/translations" - PULL_TRANSLATIONS - ${PULL_TRANSLATIONS} - CLEAN_TRANSLATIONS - ${CLEAN_TRANSLATIONS} - TRANSLATIONS_REPO - ${TRANSLATIONS_REPO} - TRANSLATIONS_REFSPEC - ${TRANSLATIONS_REFSPEC} -) - set(QTERMWIDGET_LIBRARY_NAME qtermwidget5) option(USE_UTF8PROC "Use libutf8proc for better Unicode support. Default OFF" OFF) @@ -132,6 +121,26 @@ qt5_wrap_cpp(MOCS ${HDRS}) qt5_wrap_ui(UI_SRCS ${UI}) set(PKG_CONFIG_REQ "Qt5Core, Qt5Xml, Qt5Widgets") +lxqt_translate_ts(QTERMWIDGET_QM + TRANSLATION_DIR "lib/translations" + UPDATE_TRANSLATIONS + ${UPDATE_TRANSLATIONS} + SOURCES + ${SRCS} ${HDRS} ${UI} + PULL_TRANSLATIONS + ${PULL_TRANSLATIONS} + CLEAN_TRANSLATIONS + ${CLEAN_TRANSLATIONS} + TRANSLATIONS_REPO + ${TRANSLATIONS_REPO} + TRANSLATIONS_REFSPEC + ${TRANSLATIONS_REFSPEC} + INSTALL_DIR + ${TRANSLATIONS_DIR} + COMPONENT + Runtime +) + add_library(${QTERMWIDGET_LIBRARY_NAME} SHARED ${SRCS} ${MOCS} ${UI_SRCS} ${QTERMWIDGET_QM}) target_link_libraries(${QTERMWIDGET_LIBRARY_NAME} Qt5::Widgets) set_target_properties( ${QTERMWIDGET_LIBRARY_NAME} PROPERTIES @@ -252,8 +261,6 @@ export(TARGETS ${QTERMWIDGET_LIBRARY_NAME} FILE "${CMAKE_BINARY_DIR}/${QTERMWIDGET_LIBRARY_NAME}-targets.cmake" EXPORT_LINK_INTERFACE_LIBRARIES ) - -install(FILES ${QTERMWIDGET_QM} DESTINATION ${TRANSLATIONS_DIR}) # end of main library