From b26b1455d75709a53f50e1d3d41c384f8e90b576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Wed, 3 Jul 2019 14:39:03 +0200 Subject: Implement SUBDIR-= conversion in pro2cmake tool CMake doesn't support removing subdirectories therefore one need to convert all removal to conditional adds. The resulting code doesn't win a beauty contest. That is because handle_subdir works on already processed strings which means it doesn't have access to the boolean operations. As such it can not minimize the expressions, but it works and in the most simple cases it is pretty good. The patch re-generates CMakeLists.txt under tests/auto/corelib/kernel excluding qcoreapplication, qmetatype, qmimedata, qobject, qtimer, which are suffering from unrelated problems, like for example Gui, pthread linkage issues. Change-Id: I18a02f6eda7a3b41b1313211c8bc9ce277bb67be Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor --- tests/auto/corelib/kernel/qvariant/CMakeLists.txt | 34 +++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 tests/auto/corelib/kernel/qvariant/CMakeLists.txt (limited to 'tests/auto/corelib/kernel/qvariant/CMakeLists.txt') diff --git a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt new file mode 100644 index 0000000000..2273dafd79 --- /dev/null +++ b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt @@ -0,0 +1,34 @@ +# Generated from qvariant.pro. + +##################################################################### +## tst_qvariant Test: +##################################################################### + +add_qt_test(tst_qvariant + SOURCES + tst_qvariant.cpp + DEFINES + QT_DISABLE_DEPRECATED_BEFORE=0 + INCLUDE_DIRECTORIES + ../../../other/qvariant_common + LIBRARIES + Qt::CorePrivate +) + +# Resources: +add_qt_resource(tst_qvariant "qvariant" FILES + stream/qt4.9/ + stream/qt5.0/) + + +#### Keys ignored in scope 1:.:.:qvariant.pro:: +# CONFIG = "testcase" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:qvariant.pro:qtConfig(c++14): +# CONFIG = "c++14" + +#### Keys ignored in scope 3:.:.:qvariant.pro:qtConfig(c++1z): +# CONFIG = "c++1z" -- cgit v1.2.3