diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2023-07-31 11:19:42 +0200 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2023-12-20 07:49:04 +0100 |
| commit | 613be810df6b6e83d64ceb015aaabf28e41d34da (patch) | |
| tree | 7ea8e1b3906679e60268c14aab04ab84eb78c95e /cmake | |
| parent | a82e9022310ca6219ffcaa2d67da65790e7be08a (diff) | |
Add WebEngineDriver
WebEngineDriver is a modified ChromeDriver and provides the same
functionality.
[ChangeLog][WebEngineCore] Added WebEngineDriver
Pick-to: dev
Fixes: QTBUG-82046
Task-number: QTBUG-86869
Change-Id: Ib8a40e1f6ca883efa6776c647a5b57d2930593ae
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Functions.cmake | 4 | ||||
| -rw-r--r-- | cmake/License.cmake | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake index 1ed27ae78..ed8d1e12d 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -1393,7 +1393,8 @@ endfunction() function(add_code_attributions_target) cmake_parse_arguments(PARSE_ARGV 0 arg "" - "TARGET;OUTPUT;GN_TARGET;FILE_TEMPLATE;ENTRY_TEMPLATE;BUILDDIR" "" + "TARGET;OUTPUT;GN_TARGET;FILE_TEMPLATE;ENTRY_TEMPLATE;BUILDDIR" + "EXTRA_THIRD_PARTY_DIRS" ) _qt_internal_validate_all_args_are_parsed(arg) get_filename_component(fileTemplate ${arg_FILE_TEMPLATE} ABSOLUTE) @@ -1405,6 +1406,7 @@ function(add_code_attributions_target) -DFILE_TEMPLATE=${fileTemplate} -DENTRY_TEMPLATE=${entryTemplate} -DGN_TARGET=${arg_GN_TARGET} + -DEXTRA_THIRD_PARTY_DIRS="${arg_EXTRA_THIRD_PARTY_DIRS}" -DBUILDDIR=${arg_BUILDDIR} -DOUTPUT=${arg_OUTPUT} -DPython3_EXECUTABLE=${Python3_EXECUTABLE} diff --git a/cmake/License.cmake b/cmake/License.cmake index dc1e286f1..2427ad679 100644 --- a/cmake/License.cmake +++ b/cmake/License.cmake @@ -19,6 +19,14 @@ if(NOT Python3_EXECUTABLE) find_package(Python3 3.6 REQUIRED) endif() +set(extraThirdPartyDirs "") +if(NOT "${EXTRA_THIRD_PARTY_DIRS}" STREQUAL "") + string(REPLACE " " ";" dirList ${EXTRA_THIRD_PARTY_DIRS}) + foreach(dir ${dirList}) + string(CONCAT extraThirdPartyDirs ${extraThirdPartyDirs}"${dir}",) + endforeach() +endif() + execute_process( COMMAND ${Python3_EXECUTABLE} ${LICENSE_SCRIPT} --file-template ${FILE_TEMPLATE} @@ -26,6 +34,7 @@ execute_process( --gn-binary ${Gn_EXECUTABLE} --gn-target ${GN_TARGET} --gn-out-dir ${BUILDDIR} + --extra-third-party-dirs=[${extraThirdPartyDirs}] credits ${OUTPUT} WORKING_DIRECTORY ${BUILDDIR} RESULT_VARIABLE gnResult |