1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Regenerate some of the test projects that do SUBDIRS += foo

Browse Source 
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>
This commit is contained in:
Alexandru Croitor 2019-08-01 19:36:03 +02:00
parent b4ef975a0a
commit e76c83a879
10 changed files with 89 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/auto/corelib/.prev_CMakeLists.txt Normal file
View File

@ -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()

28
tests/auto/corelib/CMakeLists.txt
View File

@ -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()

11
tests/auto/dbus/CMakeLists.txt
View File

@ -16,17 +16,14 @@ add_subdirectory(qdbusreply)
add_subdirectory(qdbusservicewatcher)
add_subdirectory(qdbustype)
add_subdirectory(qdbusthreading)
if(QT_FEATURE_process)
add_subdirectory(qdbusabstractadaptor)
add_subdirectory(qdbusabstractinterface)
add_subdirectory(qdbusinterface)
if(QT_FEATURE_private_tests)
add_subdirectory(qdbusmarshall)
endif()
endif()
if(QT_FEATURE_xml)
if(QT_FEATURE_private_tests AND QT_FEATURE_process)
add_subdirectory(qdbusmarshall)
endif()
if(TARGET Qt::Xml)
add_subdirectory(qdbusxmlparser)
endif()

19
tests/auto/gui/.prev_CMakeLists.txt Normal file
View File

@ -0,0 +1,19 @@
# Generated from gui.pro.
add_subdirectory(kernel)
if(NOT APPLE_UIKIT)
add_subdirectory(image)
add_subdirectory(math3d)
add_subdirectory(painting)
add_subdirectory(text)
add_subdirectory(util)
add_subdirectory(itemmodels)
add_subdirectory(rhi)
endif()
if(QT_FEATURE_opengl AND NOT APPLE_UIKIT AND NOT WINRT)
add_subdirectory(qopenglconfig)
add_subdirectory(qopengl)
endif()
if(QT_FEATURE_vulkan AND NOT APPLE_UIKIT)
add_subdirectory(qvulkan)
endif()

30
tests/auto/gui/CMakeLists.txt
View File

@ -1,19 +1,19 @@
# Generated from gui.pro.
add_subdirectory("kernel")
add_subdirectory(kernel)
if(NOT APPLE_UIKIT)
add_subdirectory("image")
add_subdirectory("math3d")
add_subdirectory("painting")
if (QT_FEATURE_opengl AND NOT WINRT)
# missing CMakeLists.txt: add_subdirectory("qopenglconfig")
# missing CMakeLists.txt: add_subdirectory("qopengl")
endif()
# if (QT_FEATURE_vulkan)
# add_subdirectory("qvulkan")
# endif()
# add_subdirectory("text")
add_subdirectory("util")
add_subdirectory("itemmodels")
add_subdirectory(image)
add_subdirectory(math3d)
add_subdirectory(painting)
# add_subdirectory(text) # special case missing project
add_subdirectory(util)
add_subdirectory(itemmodels)
# add_subdirectory(rhi) # special case missing project
endif()
if(QT_FEATURE_opengl AND NOT APPLE_UIKIT AND NOT WINRT)
# add_subdirectory(qopenglconfig) # special case missing project
# add_subdirectory(qopengl) # special case missing project
endif()
if(QT_FEATURE_vulkan AND NOT APPLE_UIKIT)
# add_subdirectory(qvulkan) # special case missing project
endif()

6
tests/auto/network/CMakeLists.txt
View File

@ -5,9 +5,3 @@ add_subdirectory(bearer)
add_subdirectory(kernel)
add_subdirectory(ssl)
add_subdirectory(socket)
if(WIN32)
endif()
if(WIN32 OR APPLE)
endif()

2
tests/auto/printsupport/CMakeLists.txt
View File

@ -1,2 +1,4 @@
# Generated from printsupport.pro.
add_subdirectory(dialogs)
add_subdirectory(kernel)

2
tests/auto/sql/CMakeLists.txt
View File

@ -1,2 +1,4 @@
# Generated from sql.pro.
add_subdirectory(kernel)
add_subdirectory(models)

8
tests/auto/testlib/.prev_CMakeLists.txt Normal file
View File

@ -0,0 +1,8 @@
# Generated from testlib.pro.
add_subdirectory(outformat)
add_subdirectory(qsignalspy)
add_subdirectory(selftests)
if(TARGET Qt::Widgets)
add_subdirectory(qabstractitemmodeltester)
endif()

8
tests/auto/testlib/CMakeLists.txt
View File

@ -1,4 +1,8 @@
add_subdirectory(qabstractitemmodeltester)
# Generated from testlib.pro.
# add_subdirectory(outformat) # special case missing project
add_subdirectory(qsignalspy)
add_subdirectory(selftests)
if(TARGET Qt::Widgets)
add_subdirectory(qabstractitemmodeltester)
endif()