From a7880e3d0c1f9c9c73635dd3e405ca8e7e5d6084 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 1 Nov 2017 23:47:04 +0100 Subject: [PATCH] Remove *.qm files from targets when built-in translations enabled This prevents updating *.ts files twice and in parallel leading to build errors. --- cmake/modules/AppTarget.cmake | 5 ++++- cmake/modules/LibraryTarget.cmake | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cmake/modules/AppTarget.cmake b/cmake/modules/AppTarget.cmake index 8417807..4f58b2b 100644 --- a/cmake/modules/AppTarget.cmake +++ b/cmake/modules/AppTarget.cmake @@ -34,7 +34,10 @@ else() endif() # define relevant files -set(ALL_FILES ${HEADER_FILES} ${SRC_FILES} ${GENERATED_DBUS_FILES} ${WIDGETS_FILES} ${QML_FILES} ${RES_FILES} ${QM_FILES} ${WINDOWS_ICON_PATH}) +set(ALL_FILES ${HEADER_FILES} ${SRC_FILES} ${GENERATED_DBUS_FILES} ${WIDGETS_FILES} ${QML_FILES} ${RES_FILES} ${WINDOWS_ICON_PATH}) +if(NOT BUILTIN_TRANSLATIONS) + list(APPEND ALL_FILES ${QM_FILES}) +endif() # add target for building the application add_executable(${TARGET_PREFIX}${META_PROJECT_NAME}${TARGET_SUFFIX} ${GUI_TYPE} ${ALL_FILES}) diff --git a/cmake/modules/LibraryTarget.cmake b/cmake/modules/LibraryTarget.cmake index c3d1a5f..fb644e4 100644 --- a/cmake/modules/LibraryTarget.cmake +++ b/cmake/modules/LibraryTarget.cmake @@ -99,7 +99,10 @@ endif() message(STATUS "${TARGET_PREFIX}${META_PROJECT_NAME}${TARGET_SUFFIX}: BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}") # define relevant files -set(ALL_FILES ${HEADER_FILES} ${SRC_FILES} ${GENERATED_DBUS_FILES} ${WIDGETS_FILES} ${QML_FILES} ${RES_FILES} ${QM_FILES} ${WINDOWS_ICON_PATH}) +set(ALL_FILES ${HEADER_FILES} ${SRC_FILES} ${GENERATED_DBUS_FILES} ${WIDGETS_FILES} ${QML_FILES} ${RES_FILES} ${WINDOWS_ICON_PATH}) +if(NOT BUILTIN_TRANSLATIONS) + list(APPEND ALL_FILES ${QM_FILES}) +endif() # add target for building the library if(BUILD_SHARED_LIBS)