diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-01-10 10:50:38 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-01-17 08:33:27 +0000 |
| commit | 4f26758978e84f959a28d90b2ff336bae32a2d3f (patch) | |
| tree | 056a6c261a0dd79696a36ea5f962a9b8aa8ac27e /cmake/tests | |
| parent | b705021b4eaed1e61d39dc481fd5373722c6f460 (diff) | |
CMake: Introduce Qt::GlobalConfig to hold the global features
This simplifies the handling of features a bit as it removes the special
code to store two sets of features in Qt::Core.
Change-Id: I536d41cfc76a02af054e3cfbad6bda50b1e9e49a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'cmake/tests')
| -rw-r--r-- | cmake/tests/features/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/tests/features/CMakeLists.txt b/cmake/tests/features/CMakeLists.txt index 32cff572bd..0fff2b8be9 100644 --- a/cmake/tests/features/CMakeLists.txt +++ b/cmake/tests/features/CMakeLists.txt @@ -14,14 +14,14 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../;${CMAKE_CURREN include(QtSetup) ## Library to hold global features: -add_library(Qt_global_Config INTERFACE) +add_library(GlobalConfig INTERFACE) -qt_feature_module_begin(LIBRARY Core +qt_feature_module_begin(LIBRARY GlobalConfig PUBLIC_FILE src/corelib/global/qconfig.h PRIVATE_FILE src/corelib/global/qconfig_p.h ) include("${CMAKE_CURRENT_SOURCE_DIR}/configure.cmake") -qt_feature_module_end(Qt_global_Config) +qt_feature_module_end(GlobalConfig) assert(QT_FEATURE_top_a STREQUAL "ON") assert(QT_FEATURE_top_b STREQUAL "OFF") |