diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-03-26 19:59:06 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-03-27 16:58:44 +0000 |
| commit | 8fa9a987ea7bb25ef96d325a8fbbb8031e9ada63 (patch) | |
| tree | 379df17129a9cfcc36bae55681145c65de84a9ff /cmake | |
| parent | 7406c124cb0c967adba0b4bc02d7b2af6d989fac (diff) | |
Install test executables into $prefix/tests instead of $prefix/bin
The install path takes into account the path structure of the source
directory, so that not all tests are bunched up into /tests, but
rather /tests/auto/foo/bar.
Change-Id: I5e32d2e41ae8f095f4eac6654973508efd598df0
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBuild.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 956fbf9ad1..f7d12c96ef 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -826,6 +826,7 @@ endfunction() function(add_qt_test name) qt_parse_all_arguments(arg "add_qt_test" "RUN_SERIAL" "" "${__default_private_args}" ${ARGN}) set(path "${CMAKE_CURRENT_BINARY_DIR}") + file(RELATIVE_PATH test_relative_src_dir ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) add_qt_executable("${name}" OUTPUT_DIRECTORY "${path}" @@ -840,6 +841,7 @@ function(add_qt_test name) LINK_OPTIONS ${arg_LINK_OPTIONS} MOC_OPTIONS ${arg_MOC_OPTIONS} DISABLE_AUTOGEN_TOOLS ${arg_DISABLE_AUTOGEN_TOOLS} + INSTALL_DIRECTORY ${test_relative_src_dir} ) add_test(NAME "${name}" COMMAND "${name}" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") |