From 4260b1edc5f99b26e4ca159477471786402c4a04 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Mon, 26 Aug 2019 11:08:52 +0200 Subject: [PATCH] Add OUPUT_DIRECTORY option to add_qt_test From all the observed cases, the parameters given to OUTPUT_DIRECTORY tend to be CMAKE_CURRENT_BINARY_DIR, which was the default value. This change is mainly to avoid add_qt_test failing if OUTPUT_DIRECTORY is specified. Change-Id: I26b931dd33ad1e991b64c14cc11b4b7a713fc858 Reviewed-by: Alexandru Croitor --- cmake/QtBuild.cmake | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index bc42a441ef4..5f003062485 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -2224,8 +2224,11 @@ endfunction() function(add_qt_test name) qt_parse_all_arguments(arg "add_qt_test" "RUN_SERIAL;EXCEPTIONS;GUI;QMLTEST" - "QML_IMPORTPATH" "TESTDATA;${__default_private_args};${__default_public_args}" ${ARGN}) - set(path "${CMAKE_CURRENT_BINARY_DIR}") + "QML_IMPORTPATH;OUTPUT_DIRECTORY" "TESTDATA;${__default_private_args};${__default_public_args}" ${ARGN}) + + if (NOT arg_OUTPUT_DIRECTORY) + set(arg_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") + endif() if (${arg_EXCEPTIONS}) set(exceptions_text "EXCEPTIONS") @@ -2248,7 +2251,7 @@ function(add_qt_test name) ${exceptions_text} ${gui_text} NO_INSTALL - OUTPUT_DIRECTORY "${path}" + OUTPUT_DIRECTORY "${arg_OUTPUT_DIRECTORY}" SOURCES "${arg_SOURCES}" INCLUDE_DIRECTORIES ${private_includes}