diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2014-06-25 12:46:41 +0200 |
|---|---|---|
| committer | Stephen Kelly <stephen.kelly@kdab.com> | 2014-06-25 13:38:13 +0200 |
| commit | 3cd70c11bc7bbe3c5e9e4972d2273cf51bbdc30e (patch) | |
| tree | 52b61ceee6ffdb351fd685ec78e7dcfd5062381d | |
| parent | 1e303a286e0df7723ca0144539407192363cafe3 (diff) | |
CMake: Allow modules to specify the location of tests.
Webkit has a different layout, so allow the tests to be found in
the appropriate location.
Change-Id: Iedbea6daada98a3c3efdbcfc1fe4df5d2c8cea6a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| -rw-r--r-- | mkspecs/features/create_cmake.prf | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf index abd8009288..2533b7b8d6 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -292,4 +292,13 @@ exists($$cmake_macros_file.input) { cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} -!exists($$MODULE_BASE_INDIR/tests/auto/cmake): error("Missing CMake tests.") +# We are generating cmake files. Most developers of Qt are not aware of cmake, +# so we require automatic tests to be available. The only module which should +# set CMAKE_MODULE_TESTS to '-' is enginio because that is known to be broken. +# Other modules should either create proper tests in tests/auto/cmake or, as +# a temporary measure, disable the generation of cmake files +# with 'CONFIG -= create_cmake' +!equals(CMAKE_MODULE_TESTS, -) { + isEmpty(CMAKE_MODULE_TESTS): CMAKE_MODULE_TESTS = $$MODULE_BASE_INDIR/tests/auto/cmake + !exists($$CMAKE_MODULE_TESTS): error("Missing CMake tests.") +} |