diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-05-19 17:13:20 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-05-20 10:46:34 +0200 |
| commit | dcc65ddf83fc4ccf1127dfc002c7951d6288e0d5 (patch) | |
| tree | 98ee87a3deed5856e6e62efff3605011b7873908 /tests/manual/scenegraph_lancelot/scenegraph | |
| parent | 0309f028a419b45ff86e31a0604bd3a469bd8f2d (diff) | |
CMake: Fix the lancelot manual test executable locations
Change-Id: I1b993ad0289efe6cf499189e3d49646ea292e5f0
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'tests/manual/scenegraph_lancelot/scenegraph')
| -rw-r--r-- | tests/manual/scenegraph_lancelot/scenegraph/.prev_CMakeLists.txt | 34 | ||||
| -rw-r--r-- | tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt | 2 |
2 files changed, 35 insertions, 1 deletions
diff --git a/tests/manual/scenegraph_lancelot/scenegraph/.prev_CMakeLists.txt b/tests/manual/scenegraph_lancelot/scenegraph/.prev_CMakeLists.txt new file mode 100644 index 0000000000..86f5c102a9 --- /dev/null +++ b/tests/manual/scenegraph_lancelot/scenegraph/.prev_CMakeLists.txt @@ -0,0 +1,34 @@ +# Generated from scenegraph.pro. + +##################################################################### +## tst_scenegraph Test: +##################################################################### + +# Collect test data +list(APPEND test_data "../data") + +qt_add_test(tst_scenegraph + OUTPUT_DIRECTORY ".." + SOURCES + ../../../../../qtbase/tests/baselineserver/shared/baselineprotocol.cpp ../../../../../qtbase/tests/baselineserver/shared/baselineprotocol.h + ../../../../../qtbase/tests/baselineserver/shared/lookup3.cpp + ../../../../../qtbase/tests/baselineserver/shared/qbaselinetest.cpp ../../../../../qtbase/tests/baselineserver/shared/qbaselinetest.h + tst_scenegraph.cpp + DEFINES + QMAKESPEC=\\\"\\\" + INCLUDE_DIRECTORIES + ../../../../../qtbase/tests/baselineserver/shared + PUBLIC_LIBRARIES + Qt::Gui + Qt::Network + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +#### Keys ignored in scope 3:.:.:scenegraph.pro:WIN32: +# TEST_HELPER_INSTALLS = ".././qmlscenegrabber.exe" + +#### Keys ignored in scope 6:.:.:scenegraph.pro:else: +# TEST_HELPER_INSTALLS = ".././qmlscenegrabber" diff --git a/tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt b/tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt index 86f5c102a9..407fd9976c 100644 --- a/tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt +++ b/tests/manual/scenegraph_lancelot/scenegraph/CMakeLists.txt @@ -8,7 +8,7 @@ list(APPEND test_data "../data") qt_add_test(tst_scenegraph - OUTPUT_DIRECTORY ".." + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.." # special case SOURCES ../../../../../qtbase/tests/baselineserver/shared/baselineprotocol.cpp ../../../../../qtbase/tests/baselineserver/shared/baselineprotocol.h ../../../../../qtbase/tests/baselineserver/shared/lookup3.cpp |