diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-12 16:29:58 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-15 10:56:16 +0000 |
| commit | 4572ded8b32ea8883a0414f0cd65b9634feb5b5b (patch) | |
| tree | c6cb9ac2c42e5e9c4a73da1199c692c2c352af34 /cmake | |
| parent | b8dae2c617af4cceb886b5ae87ab3dbe79a4ecd0 (diff) | |
Fix copying / installing of testdata to proper location
I don't know why, but previously the test data was copied to
"test_build_dir/testdata" subfolder. That's incorrect, there's no
need for a testdata subfolder, the copied / installed contents
should go directly under the test build dir / install dir.
Incidentally this will make the corelib/io/qdir tests to pass.
Amends 1307736c7db1ff24e3b8282f4a7b14d24866feba .
Change-Id: I9e180d608433fe82f4a29afea7f594507e6020d3
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBuild.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index cf9a9a90cc..3aa0c30268 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -2239,7 +2239,7 @@ function(add_qt_test name) "${QT_TOP_LEVEL_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}") qt_path_join(testdata_install_dir ${QT_INSTALL_DIR} - "${relative_path_to_test_project}/testdata") + "${relative_path_to_test_project}") foreach(testdata IN LISTS arg_TESTDATA) set(testdata "${CMAKE_CURRENT_SOURCE_DIR}/${testdata}") if (IS_DIRECTORY "${testdata}") |