From b85b3130f963752e58767b018eaef7a5f7a23362 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 31 Oct 2016 18:58:07 +0100 Subject: [PATCH] Changed: Don't update qtbase_*.ts files --- code/ryzom/tools/client/client_config_qt/CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/ryzom/tools/client/client_config_qt/CMakeLists.txt b/code/ryzom/tools/client/client_config_qt/CMakeLists.txt index 52323ee05..9cbe2bd3b 100644 --- a/code/ryzom/tools/client/client_config_qt/CMakeLists.txt +++ b/code/ryzom/tools/client/client_config_qt/CMakeLists.txt @@ -4,7 +4,8 @@ FILE(GLOB SRC src/*.cpp src/*.h resources/*.rc) FILE(GLOB CLIENT_CONFIG_HDR src/*.h) FILE(GLOB CLIENT_CONFIG_UIS ui/*.ui) -FILE(GLOB CLIENT_CONFIG_TRANS translations/*.ts) +FILE(GLOB CLIENT_CONFIG_BASE_TRANS translations/qtbase_*.ts) +FILE(GLOB CLIENT_CONFIG_TRANS translations/ryzom_configuration_*.ts) CONFIGURE_FILE(translations/translations.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc COPYONLY) SET(CLIENT_CONFIG_RCS resources/resources.qrc ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc ) @@ -22,7 +23,7 @@ IF(WITH_QT) ELSE() # uncomment this line if you want to update original translations # QT5_CREATE_TRANSLATION(CLIENT_CONFIG_QM ${CLIENT_CONFIG_UIS} ${SRC} ${CLIENT_CONFIG_TRANS} OPTIONS -I ${CMAKE_CURRENT_SOURCE_DIR}) - QT5_ADD_TRANSLATION(CLIENT_CONFIG_QM ${CLIENT_CONFIG_TRANS}) + QT5_ADD_TRANSLATION(CLIENT_CONFIG_QM ${CLIENT_CONFIG_TRANS} ${CLIENT_CONFIG_BASE_TRANS}) QT5_ADD_RESOURCES(CLIENT_CONFIG_RC_SRCS ${CLIENT_CONFIG_RCS}) QT5_WRAP_CPP(CLIENT_CONFIG_MOC_SRC ${CLIENT_CONFIG_HDR}) QT5_WRAP_UI(CLIENT_CONFIG_UI_HDRS ${CLIENT_CONFIG_UIS}) @@ -31,9 +32,9 @@ ENDIF() SOURCE_GROUP("Resources" FILES ${CLIENT_CONFIG_RCS}) SOURCE_GROUP("Forms" FILES ${CLIENT_CONFIG_UIS}) SOURCE_GROUP("Generated Files" FILES ${CLIENT_CONFIG_UI_HDRS} ${CLIENT_CONFIG_MOC_SRC}) -SOURCE_GROUP("Translation Files" FILES ${CLIENT_CONFIG_TRANS} ) +SOURCE_GROUP("Translation Files" FILES ${CLIENT_CONFIG_TRANS} ${CLIENT_CONFIG_BASE_TRANS}) -ADD_EXECUTABLE(ryzom_configuration_qt WIN32 ${SRC} ${CLIENT_CONFIG_MOC_SRC} ${CLIENT_CONFIG_UI_HDRS} ${CLIENT_CONFIG_RC_SRCS} ${CLIENT_CONFIG_TRANS} ${CLIENT_CONFIG_QM}) +ADD_EXECUTABLE(ryzom_configuration_qt WIN32 ${SRC} ${CLIENT_CONFIG_MOC_SRC} ${CLIENT_CONFIG_UI_HDRS} ${CLIENT_CONFIG_RC_SRCS} ${CLIENT_CONFIG_TRANS} ${CLIENT_CONFIG_BASE_TRANS} ${CLIENT_CONFIG_QM}) NL_DEFAULT_PROPS(ryzom_configuration_qt "Ryzom, Tools: Ryzom Configuration Qt" ) NL_ADD_RUNTIME_FLAGS( ryzom_configuration_qt ) NL_ADD_LIB_SUFFIX( ryzom_configuration_qt )