diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-01 19:36:03 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-07 11:55:38 +0000 |
| commit | e76c83a879f4a2efa40ee5e65acebefc8f9b4cb1 (patch) | |
| tree | 187746a8a1b754d9dccbc249b45d2df4d851df0d /tests/auto/corelib | |
| parent | b4ef975a0a6e8c22d3c0851f9d7b11738d37b662 (diff) | |
Regenerate some of the test projects that do SUBDIRS += foo
This show cases the new cleaner subdirs handling code in
pro2cmake.
Change-Id: I25001942ef020e4c4191b355f55309c4fb033ecc
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/corelib')
| -rw-r--r-- | tests/auto/corelib/.prev_CMakeLists.txt | 17 | ||||
| -rw-r--r-- | tests/auto/corelib/CMakeLists.txt | 28 |
2 files changed, 33 insertions, 12 deletions
diff --git a/tests/auto/corelib/.prev_CMakeLists.txt b/tests/auto/corelib/.prev_CMakeLists.txt new file mode 100644 index 0000000000..906e496da9 --- /dev/null +++ b/tests/auto/corelib/.prev_CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from corelib.pro. + +add_subdirectory(kernel) +if(NOT APPLE_UIKIT) + add_subdirectory(animation) + add_subdirectory(codecs) + add_subdirectory(global) + add_subdirectory(io) + add_subdirectory(itemmodels) + add_subdirectory(mimetypes) + add_subdirectory(plugin) + add_subdirectory(serialization) + add_subdirectory(statemachine) + add_subdirectory(thread) + add_subdirectory(time) + add_subdirectory(tools) +endif() diff --git a/tests/auto/corelib/CMakeLists.txt b/tests/auto/corelib/CMakeLists.txt index 987df6cb4d..cb1228a1a0 100644 --- a/tests/auto/corelib/CMakeLists.txt +++ b/tests/auto/corelib/CMakeLists.txt @@ -1,13 +1,17 @@ -add_subdirectory(animation) -add_subdirectory(codecs) -add_subdirectory(global) -add_subdirectory(io) -add_subdirectory(itemmodels) -add_subdirectory(kernel) -add_subdirectory(mimetypes) -add_subdirectory(serialization) -add_subdirectory(statemachine) -add_subdirectory(thread) -add_subdirectory(tools) -add_subdirectory(time) +# Generated from corelib.pro. +add_subdirectory(kernel) +if(NOT APPLE_UIKIT) + add_subdirectory(animation) + add_subdirectory(codecs) + add_subdirectory(global) + add_subdirectory(io) + add_subdirectory(itemmodels) + add_subdirectory(mimetypes) + # add_subdirectory(plugin) # special case missing project + add_subdirectory(serialization) + add_subdirectory(statemachine) + add_subdirectory(thread) + add_subdirectory(time) + add_subdirectory(tools) +endif() |