diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-01-14 11:35:53 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-01-17 16:16:55 +0000 |
| commit | 6a1ee4de07cbaaeb0583b191fee6258e0a4003e4 (patch) | |
| tree | e86409147fc72c1f714773baf810380b1aa33da8 /src | |
| parent | 3ec578020c9e088c7356da07d9112ece37bbf496 (diff) | |
CMake: Store Qt features in CMake Cache
This is less self-contained than what we have, but significantly speeds
up cmake configure/generate runs.
This patch also warns when a feature is already defined.
Change-Id: I8cab63e208ba98756b47d362a39b462f5ec55e20
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/gui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/platformsupport/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/CMakeLists.txt | 2 |
4 files changed, 0 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 375b102f58..503d7717fa 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -58,7 +58,6 @@ add_subdirectory(tools) if(QT_FEATURE_gui) add_subdirectory(gui) - qt_pull_features_into_current_scope(PUBLIC_FEATURES Qt::Gui) if(QT_FEATURE_widgets) add_subdirectory(widgets) if(QT_FEATURE_opengl) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index dd2b101689..81ef8b1b66 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -6,8 +6,6 @@ find_library(FWCoreGraphics CoreGraphics) ## Gui Module: ##################################################################### -qt_load_global_features() - if (QT_FEATURE_gui) if (WINRT) set(_default_platform "winrt") diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt index c571f940c8..e298eb4bc5 100644 --- a/src/platformsupport/CMakeLists.txt +++ b/src/platformsupport/CMakeLists.txt @@ -1,6 +1,5 @@ # Generated from platformsupport.pro. -qt_pull_features_into_current_scope(PRIVATE_FEATURES Qt::Gui) add_subdirectory(themes) add_subdirectory(edid) add_subdirectory(eventdispatchers) diff --git a/src/plugins/platforms/CMakeLists.txt b/src/plugins/platforms/CMakeLists.txt index f0ac297d17..0a01b80bc8 100644 --- a/src/plugins/platforms/CMakeLists.txt +++ b/src/plugins/platforms/CMakeLists.txt @@ -1,5 +1,3 @@ -qt_pull_features_into_current_scope(PRIVATE_FEATURES Qt::Gui) - if(QT_FEATURE_xcb) add_subdirectory(xcb) endif() |