diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-01 18:41:14 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-07-01 18:41:14 +0200 |
commit | e6a94778d0c26b59e367e9f9fe4f401725fc9c4e (patch) | |
tree | c7597213d7eac14863bc3cfd7bccd247c8950710 /mkspecs/features/create_cmake.prf | |
parent | 605ba2c2268b2dce3d0b06899101d03a67e7f251 (diff) | |
parent | a09a8d509a69ed16d8afbe15296b8332cacd6c66 (diff) |
Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev
Diffstat (limited to 'mkspecs/features/create_cmake.prf')
-rw-r--r-- | mkspecs/features/create_cmake.prf | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf index aee3e79765..2533b7b8d6 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -166,8 +166,6 @@ contains(CONFIG, plugin) { return() } -contains($$list(network sql widgets gui), $$MODULE): CMAKE_LOAD_PLUGINS = true - unix:contains(QT_CONFIG, reduce_relocations):CMAKE_ADD_FPIE_FLAGS = "true" CMAKE_MKSPEC = $$[QMAKE_XSPEC] @@ -293,3 +291,14 @@ exists($$cmake_macros_file.input) { } cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} + +# 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.") +} |