From 68de090b1fce66f36743d31f384398af8c140a1d Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Thu, 25 Feb 2021 18:45:10 +0100 Subject: Refactor and create gn target Refactor the gn handling and add: * the gn target for encapsulating resources needed to run chromium builds * the support for SOURCES, INCLUDES, DEFINES, COMPILE OPTIONS. * the multi config support for cmake and enable debug, release builds * CONDITION evaluation for the gn target and the gn arg list * the linux specific config and all missing source sets * use REALPATH instead of ABSOLUTE, this fixes missing drive letter on windows Task-number: QTBUG-91760 Change-Id: Ib283d8ab817ff36ee9c94c2b8f44785709c45258 Reviewed-by: Allan Sandfeld Jensen --- tests/auto/httpserver/httpserver.cmake | 3 ++- tests/auto/widgets/proxypac/CMakeLists.txt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/httpserver/httpserver.cmake b/tests/auto/httpserver/httpserver.cmake index 78d13055c..e10c52b76 100644 --- a/tests/auto/httpserver/httpserver.cmake +++ b/tests/auto/httpserver/httpserver.cmake @@ -28,8 +28,9 @@ if (NOT TARGET Test::HttpServer) Qt::Network ) + get_filename_component(SERVER_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}" REALPATH) target_compile_definitions(httpserver PRIVATE - SERVER_SOURCE_DIR="${CMAKE_CURRENT_LIST_DIR}" + SERVER_SOURCE_DIR="${SERVER_SOURCE_DIR}" ) set_target_properties(httpserver PROPERTIES diff --git a/tests/auto/widgets/proxypac/CMakeLists.txt b/tests/auto/widgets/proxypac/CMakeLists.txt index 25d754cf7..6a20bc95a 100644 --- a/tests/auto/widgets/proxypac/CMakeLists.txt +++ b/tests/auto/widgets/proxypac/CMakeLists.txt @@ -9,7 +9,8 @@ qt_internal_add_test(tst_proxypac_file ) if(WIN32) - set(fileEnvArg "--proxy-pac-url=\"file:///${CMAKE_CURRENT_LIST_DIR}/proxy.pac\"") + get_filename_component(SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}" REALPATH) + set(fileEnvArg "--proxy-pac-url=\"file:///${SOURCE_DIR}/proxy.pac\"") elseif(boot2qt) set(fileEnvArg "--single-process --no-sandbox --proxy-pac-url=\"file://${CMAKE_CURRENT_LIST_DIR}/proxy.pac\"") else() -- cgit v1.2.3