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 /cmake/QtModuleConfig.cmake.in | |
| 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 'cmake/QtModuleConfig.cmake.in')
| -rw-r--r-- | cmake/QtModuleConfig.cmake.in | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cmake/QtModuleConfig.cmake.in b/cmake/QtModuleConfig.cmake.in index 32f30fed7e..e08c4ff87f 100644 --- a/cmake/QtModuleConfig.cmake.in +++ b/cmake/QtModuleConfig.cmake.in @@ -2,8 +2,12 @@ find_package(Qt@PROJECT_VERSION_MAJOR@ QUIET) -include("${CMAKE_CURRENT_LIST_DIR}/@versioned_module_name@Targets.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/@module_versioned@Targets.cmake") -if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/@versioned_module_name@Macros.cmake") - include("${CMAKE_CURRENT_LIST_DIR}/@versioned_module_name@Macros.cmake") +if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/@module_versioned@Macros.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/@module_versioned@Macros.cmake") endif() + +include QtFeature + +qt_make_features_available(Qt::@module@) |