From ba165cae71746719a990da66abb40649ece69303 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Wed, 12 Feb 2020 17:19:17 +0100 Subject: [PATCH] Set qt_add_test WORKING_DIRECTORY to OUTPUT_DIRECTORY If qt_add_test() is called with OUTPUT_DIRECTORY and no WORKING_DIRECTORY is specified, default the WORKING_DIRECTORY to the same value as OUTPUT_DIRECTORY._ Change-Id: If373fe590508ad58d4632e0598cd0d9dddb2ae16 Reviewed-by: Simon Hausmann --- cmake/QtBuild.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 9c7719d87c..b8bd422c53 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -2724,6 +2724,8 @@ function(qt_add_test name) else() if (arg_WORKING_DIRECTORY) set(test_working_dir "${arg_WORKING_DIRECTORY}") + elseif(arg_OUTPUT_DIRECTORY) + set(test_working_dir "${arg_OUTPUT_DIRECTORY}") else() set(test_working_dir "${CMAKE_CURRENT_BINARY_DIR}") endif()