path: root/src/corelib/Qt5CTestMacros.cmake
diff options
authorStephen Kelly <>2013-02-08 00:48:57 +0100
committerThe Qt Project <>2013-02-09 19:35:25 +0100
commit316d8ececa3314ec16baf46ec4f1c5440cd951ef (patch)
treee716402ff5abdafb3375beb657d2bc8a94170c5a /src/corelib/Qt5CTestMacros.cmake
parent8fd7d46b3a698a212d958e61036dd493cb7c9ca5 (diff)
Don't duplicate the 'top-level' include dir in all modules.
This is the <prefix>/include directory which is independent of the module and which only has to be used once. As everything uses QtCore, it is enough to set it only there. The CI system is a special case, in that it tests things before installation. Handle that case too. Change-Id: Idcdf9617e199b7d490cb3553cce07f1f464b3bec Reviewed-by: Stephen Kelly <>
Diffstat (limited to 'src/corelib/Qt5CTestMacros.cmake')
1 files changed, 12 insertions, 0 deletions
diff --git a/src/corelib/Qt5CTestMacros.cmake b/src/corelib/Qt5CTestMacros.cmake
index c5d10c9b5b..60b98a7138 100644
--- a/src/corelib/Qt5CTestMacros.cmake
+++ b/src/corelib/Qt5CTestMacros.cmake
@@ -94,6 +94,18 @@ function(test_module_includes)
+ # Because the CI system tests built packages before installation,
+ # the include dir allowing module-includes for the new module is not
+ # the same as the dir for QtCore (because that is at the installation
+ # location). The CI system is untypical here in that it attempts to use
+ # packages while they are in an intermediate state, so we work around
+ # that in the test system.
+ set(packages_string
+ "${packages_string}
+ include_directories(\"\${Qt5${qtmodule}_DIR}/../../../include\")\n"
+ )
set(libraries_string "${libraries_string} Qt5::${qtmodule}")