1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add OUPUT_DIRECTORY option to add_qt_test

Browse Source 
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 <alexandru.croitor@qt.io>
This commit is contained in:
Leander Beernaert 2019-08-26 11:08:52 +02:00
parent 103d1aa910
commit 4260b1edc5
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/QtBuild.cmake
View File

@ -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}