Split Qt-specific config from other config

So adding Qt-specific config does not require a change
in c++utilities anymore.
This commit is contained in:
Martchus 2018-03-07 18:22:53 +01:00
parent 4980c8df95
commit 0409b77831
4 changed files with 27 additions and 2 deletions

View File

@ -96,6 +96,7 @@ set(CMAKE_MODULE_FILES
)
set(CMAKE_TEMPLATE_FILES
cmake/templates/qtconfig.h.in
cmake/templates/webviewdefs.h.in
cmake/templates/webviewincludes.h.in
cmake/templates/jsdefs.h.in
@ -177,7 +178,7 @@ else()
endif()
# find c++utilities
find_package(c++utilities 4.12.0 REQUIRED)
find_package(c++utilities 4.13.0 REQUIRED)
use_cpp_utilities()
# include modules to apply configuration

View File

@ -408,4 +408,12 @@ if(WIDGETS_UI_FILES AND WIDGETS_GUI)
endif()
endif()
# add configuration header for Qt-specific configuration
include(TemplateFinder)
find_template_file("qtconfig.h" QT_UTILITIES QT_CONFIG_H_TEMPLATE_FILE)
configure_file(
"${QT_CONFIG_H_TEMPLATE_FILE}"
"${CMAKE_CURRENT_BINARY_DIR}/resources/qtconfig.h"
)
set(QT_CONFIGURED YES)

View File

@ -0,0 +1,16 @@
// Created via CMake from template qtconfig.h.in
// WARNING! Any changes to this file will be overwritten by the next CMake run!
#ifndef @META_PROJECT_VARNAME_UPPER@_QT_CONFIG
#define @META_PROJECT_VARNAME_UPPER@_QT_CONFIG
#define QT_TRANSLATION_FILES {@QT_TRANSLATION_FILES_ARRAY@}
#define APP_SPECIFIC_QT_TRANSLATION_FILES {@APP_SPECIFIC_QT_TRANSLATION_FILES_ARRAY@}
#define ENABLE_QT_RESOURCES_OF_STATIC_DEPENDENCIES@ENABLE_QT_RESOURCES_OF_STATIC_DEPENDENCIES@
#cmakedefine SVG_SUPPORT
#cmakedefine SVG_ICON_SUPPORT
#cmakedefine IMAGE_FORMAT_SUPPORT
#define IMPORT_IMAGE_FORMAT_PLUGINS @IMAGE_FORMAT_SUPPORT_ARRAY@
#define IMPORT_WIDGET_STYLE_PLUGINS @WIDGET_STYLE_PLUGINS_ARRAY@
@META_CUSTOM_QT_CONFIG@
#endif // @META_PROJECT_VARNAME_UPPER@_QT_CONFIG

View File

@ -1,7 +1,7 @@
#ifndef MISC_UTILS_IMPORT_PLUGIN_H
#define MISC_UTILS_IMPORT_PLUGIN_H
#include "resources/config.h"
#include "resources/qtconfig.h"
#ifdef QT_STATIC
#if defined(QT_UTILITIES_GUI_QTWIDGETS) || defined(QT_UTILITIES_GUI_QTQUICK)