From 640d20c463ae243fd8f48bbc32bf88ae43425003 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 7 Jan 2017 16:07:03 +0100 Subject: [PATCH] Make Qt translations of dependencies available in config.h --- CMakeLists.txt | 2 +- cmake/templates/Config.cmake.in | 5 +++++ cmake/templates/config.h.in | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index acf66bf..d3d5fba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -115,7 +115,7 @@ set(META_APP_AUTHOR "Martchus") set(META_APP_URL "https://github.com/${META_APP_AUTHOR}/${META_PROJECT_NAME}") set(META_APP_DESCRIPTION "Common C++ classes and routines used by my applications such as argument parser, IO and conversion utilities") set(META_VERSION_MAJOR 4) -set(META_VERSION_MINOR 4) +set(META_VERSION_MINOR 5) set(META_VERSION_PATCH 0) # find required 3rd party libraries diff --git a/cmake/templates/Config.cmake.in b/cmake/templates/Config.cmake.in index 0b01f58..c9d9c4b 100644 --- a/cmake/templates/Config.cmake.in +++ b/cmake/templates/Config.cmake.in @@ -34,6 +34,7 @@ set(@META_PROJECT_VARNAME_UPPER@_PRIVATE_QT_MODULES "@QT_MODULES@") set(@META_PROJECT_VARNAME_UPPER@_PRIVATE_KF_MODULES "@KF_MODULES@") set(@META_PROJECT_VARNAME_UPPER@_PUBLIC_QT_MODULES "@META_PUBLIC_QT_MODULES@") set(@META_PROJECT_VARNAME_UPPER@_PUBLIC_KF_MODULES "@META_PUBLIC_KF_MODULES@") +set(@META_PROJECT_VARNAME_UPPER@_HAS_QT_TRANSLATION_FILES @APP_SPECIFIC_QT_TRANSLATIONS_AVAILABLE@) macro(use_@META_PROJECT_VARNAME@) # make CMake modules of the project available @@ -52,4 +53,8 @@ macro(use_@META_PROJECT_VARNAME@) # add required Qt and KF modules list(APPEND IMPORTED_QT_MODULES ${@META_PROJECT_VARNAME_UPPER@_PUBLIC_QT_MODULES}) list(APPEND IMPORTED_KF_MODULES ${@META_PROJECT_VARNAME_UPPER@_PUBLIC_KF_MODULES}) + # add required translations to APP_SPECIFIC_QT_TRANSLATION_FILES_ARRAY + if(@META_PROJECT_VARNAME_UPPER@_HAS_QT_TRANSLATION_FILES) + list(APPEND APP_SPECIFIC_QT_TRANSLATION_FILES @META_PROJECT_NAME@) + endif() endmacro() diff --git a/cmake/templates/config.h.in b/cmake/templates/config.h.in index ad9d1ba..c97b9a9 100644 --- a/cmake/templates/config.h.in +++ b/cmake/templates/config.h.in @@ -12,6 +12,7 @@ #define APP_DESCRIPTION @META_APP_DESCRIPTION_STR@ #define APP_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@" #define QT_TRANSLATION_FILES {@QT_TRANSLATION_FILES_ARRAY@} +#define APP_SPECIFIC_QT_TRANSLATION_FILES {@APP_SPECIFIC_QT_TRANSLATION_FILES_ARRAY@} #cmakedefine SVG_SUPPORT #cmakedefine SVG_ICON_SUPPORT