diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-13 23:33:24 +0200 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-04-15 11:11:51 +0000 |
| commit | 884679a7cc74b85d6c565316520304a9c73b5f04 (patch) | |
| tree | 2611a1cc6efaa4dbcc7f6945072aca4f09d41833 /mkspecs/features/ctest_testcase_common.prf | |
| parent | ba5af03a5a505d4ef19ccea1c0170e50abf3db8c (diff) | |
cmake: Generate INTERFACE targets for include-only modules.
Require CMake 3.0 if an attempt is made to use a cmake file containing
an INTERFACE library.
If the user is using a CMake version older than 3.0, then exclude INTERFACE
libraries from dependencies of Qt modules. The Qt CI system is running
CMake versions as old as 2.8.11, which makes that the current minimum version.
The only header-only module existing so far is the QtUiPlugin module, which
has been split out from the QtDesigner module. If using CMake 2.8, the
forwarding headers in the QtDesigner module will be used, and the effect
of the split out library will not be seen. If using CMake 3.0, the
split out library is listed as a dependency and its transitive usage
requirements such as the QT_UIPLUGIN_LIB definition are made available.
Change-Id: Iecee3bbc440842dca27dc067f2a31e3526efa01b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs/features/ctest_testcase_common.prf')
| -rw-r--r-- | mkspecs/features/ctest_testcase_common.prf | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mkspecs/features/ctest_testcase_common.prf b/mkspecs/features/ctest_testcase_common.prf index b98a613f55..bdf40541ec 100644 --- a/mkspecs/features/ctest_testcase_common.prf +++ b/mkspecs/features/ctest_testcase_common.prf @@ -61,7 +61,12 @@ BUILD_DIR = $$replace($$list($$OUT_PWD/build), /, $$QMAKE_DIR_SEP) dependentmodules = $$resolve_depends(CMAKE_QT_MODULES_UNDER_TEST, "QT.") dependentmodules -= $$CMAKE_QT_MODULES_UNDER_TEST -dependentmodules = $$cmakeModuleList($$dependentmodules) + +mod_deps = +for (dep, dependentmodules): \ + !contains(QT.$${dep}.module_config, no_link): \ + mod_deps += $$cmakeModuleName($$dep) +dependentmodules = $$join(mod_deps, ";") contains(QT_CONFIG, angle): CMAKE_GL_DEFINES = -DQT_WITH_ANGLE=True !contains(QT_CONFIG, egl): CMAKE_GL_DEFINES += -DNO_EGL=True |