diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | tests/manual/CMakeLists.txt | 7 |
2 files changed, 18 insertions, 4 deletions
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 0bd3b47d92..c03838bee1 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -1,8 +1,6 @@ # Generated from auto.pro. -if (NOT APPLE_UIKIT) - add_subdirectory(corelib) -endif() +add_subdirectory(corelib) if (QT_FEATURE_dbus) set(run_dbus_tests ON) if(NOT CMAKE_CROSSCOMPILING AND TARGET Qt::DBus) @@ -22,9 +20,18 @@ if (QT_FEATURE_dbus) add_subdirectory(dbus) endif() endif() -if (NOT APPLE_UIKIT AND TARGET Qt::Gui) +if (TARGET Qt::Gui) add_subdirectory(gui) endif() + +# special case begin +# Build only corelib and gui tests when targeting uikit (iOS), +# because the script can't handle the SUBDIRS assignment well. +if (APPLE_UIKIT) + return() +endif() +# special case end + if (TARGET Qt::Network AND NOT WINRT) add_subdirectory(network) endif() diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt index 31547f6df7..9d5a3effaa 100644 --- a/tests/manual/CMakeLists.txt +++ b/tests/manual/CMakeLists.txt @@ -1,5 +1,12 @@ # Generated from manual.pro. +# special case begn +# Don't build manual tests when targeting iOS. +if(APPLE_UIKIT) + return() +endif() +# special case end + add_subdirectory(bearerex) add_subdirectory(filetest) add_subdirectory(embeddedintoforeignwindow) |