diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-03-12 11:29:28 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-03-12 13:21:09 +0100 |
| commit | da3a24c06541b63011a3af91fbae9f9d2ec28912 (patch) | |
| tree | 2a6c42c04e2a7187f3cf4180a3cfe5041694f4cb /tests | |
| parent | b7834eefa615cf2ba2028ec7c7f525b74bdea969 (diff) | |
Re-generate the CMake project files
Change-Id: Icdfe81a51b626034bd86bf143eb1fe108603d148
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/.prev_CMakeLists.txt | 9 | ||||
| -rw-r--r-- | tests/auto/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/conversion/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/qaxobject/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/qaxscript/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/manual/axviewer/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/manual/axviewer/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/manual/dumpcpp/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/manual/testcontrol/CMakeLists.txt | 2 |
9 files changed, 17 insertions, 9 deletions
diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt new file mode 100644 index 0000000..adb25cf --- /dev/null +++ b/tests/auto/.prev_CMakeLists.txt @@ -0,0 +1,9 @@ +# Generated from auto.pro. + +add_subdirectory(conversion) +add_subdirectory(qaxobject) +add_subdirectory(dumpcpp) +add_subdirectory(cmake) +if(NOT GCC) + add_subdirectory(qaxscript) +endif() diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 8537f4f..2502019 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -3,7 +3,7 @@ add_subdirectory(conversion) add_subdirectory(qaxobject) # add_subdirectory(dumpcpp) (needs typelib target) # special case -#add_subdirectory(cmake) # special case +# add_subdirectory(cmake) # special case if(NOT GCC) add_subdirectory(qaxscript) endif() diff --git a/tests/auto/conversion/CMakeLists.txt b/tests/auto/conversion/CMakeLists.txt index 4aab821..54da953 100644 --- a/tests/auto/conversion/CMakeLists.txt +++ b/tests/auto/conversion/CMakeLists.txt @@ -4,7 +4,7 @@ ## conversion Test: ##################################################################### -qt_add_test(conversion +qt_internal_add_test(conversion # special case SOURCES tst_conversion.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qaxobject/CMakeLists.txt b/tests/auto/qaxobject/CMakeLists.txt index 7c07415..6c1fe7d 100644 --- a/tests/auto/qaxobject/CMakeLists.txt +++ b/tests/auto/qaxobject/CMakeLists.txt @@ -4,7 +4,7 @@ ## qaxobject Test: ##################################################################### -qt_add_test(qaxobject +qt_internal_add_test(qaxobject # special case SOURCES tst_qaxobject.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qaxscript/CMakeLists.txt b/tests/auto/qaxscript/CMakeLists.txt index 4312217..bfc512d 100644 --- a/tests/auto/qaxscript/CMakeLists.txt +++ b/tests/auto/qaxscript/CMakeLists.txt @@ -4,7 +4,7 @@ ## qaxscript Test: ##################################################################### -qt_add_test(qaxscript +qt_internal_add_test(qaxscript # special case SOURCES tst_qaxscript.cpp PUBLIC_LIBRARIES diff --git a/tests/manual/axviewer/.prev_CMakeLists.txt b/tests/manual/axviewer/.prev_CMakeLists.txt index 8864fee..bcbe193 100644 --- a/tests/manual/axviewer/.prev_CMakeLists.txt +++ b/tests/manual/axviewer/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## axviewer Binary: ##################################################################### -qt_add_executable(axviewer +qt_add_manual_test(axviewer SOURCES ../shared/metaobjectdump.cpp ../shared/metaobjectdump.h ../shared/textdialog.cpp ../shared/textdialog.h diff --git a/tests/manual/axviewer/CMakeLists.txt b/tests/manual/axviewer/CMakeLists.txt index f34e32c..06ab7e0 100644 --- a/tests/manual/axviewer/CMakeLists.txt +++ b/tests/manual/axviewer/CMakeLists.txt @@ -4,8 +4,7 @@ ## axviewer Binary: ##################################################################### -# qt_add_executable(axviewer # special case -qt_add_manual_test(axviewer # special case +qt_internal_add_manual_test(axviewer # special case SOURCES ../shared/metaobjectdump.cpp ../shared/metaobjectdump.h ../shared/textdialog.cpp ../shared/textdialog.h diff --git a/tests/manual/dumpcpp/CMakeLists.txt b/tests/manual/dumpcpp/CMakeLists.txt index bc681d9..44e94a8 100644 --- a/tests/manual/dumpcpp/CMakeLists.txt +++ b/tests/manual/dumpcpp/CMakeLists.txt @@ -4,7 +4,7 @@ ## dumpcpp Binary: ##################################################################### -qt_add_executable(dumpcpp +qt_internal_add_manual_test(dumpcpp # special case SOURCES ../shared/metaobjectdump.cpp ../shared/metaobjectdump.h ../shared/textdialog.cpp ../shared/textdialog.h diff --git a/tests/manual/testcontrol/CMakeLists.txt b/tests/manual/testcontrol/CMakeLists.txt index 3115e4d..ecf0192 100644 --- a/tests/manual/testcontrol/CMakeLists.txt +++ b/tests/manual/testcontrol/CMakeLists.txt @@ -4,7 +4,7 @@ ## testcontrol Binary: ##################################################################### -qt_add_executable(testcontrol +qt_internal_add_manual_test(testcontrol # special case GUI SOURCES main.cpp |