From ea1b1efbc1e14c9960c46e731f0681ee398343d7 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 26 Mar 2013 10:47:01 +0100 Subject: Revert "Don't duplicate the 'top-level' include dir in all modules." This will likely fix some odd cmake related tests in the CI. This reverts commit 316d8ececa3314ec16baf46ec4f1c5440cd951ef. Conflicts: mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in src/corelib/Qt5CoreConfigExtras.cmake.in Change-Id: Ib7714746f96bf12061d92242a42296d200c56c00 Reviewed-by: David Faure (KDE) --- src/corelib/Qt5CTestMacros.cmake | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'src/corelib/Qt5CTestMacros.cmake') diff --git a/src/corelib/Qt5CTestMacros.cmake b/src/corelib/Qt5CTestMacros.cmake index 297a9e07f6..32af44a79d 100644 --- a/src/corelib/Qt5CTestMacros.cmake +++ b/src/corelib/Qt5CTestMacros.cmake @@ -101,18 +101,6 @@ function(test_module_includes) include_directories(\${Qt5${qtmodule}_INCLUDE_DIRS}) add_definitions(\${Qt5${qtmodule}_DEFINITIONS})\n" ) - - # 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}") endwhile() -- cgit v1.2.3