From 4245e8c147f3bc3512352b73462774c042426e81 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Tue, 10 Aug 2021 10:16:44 +0200 Subject: Refactor gn target Currently we get hangs on ci, to investigate the issue go through current cmake code and: * remove all dummy ninja targets * remove implicit dependencies * build dir in form of buildDir/config/arch * separate ninja call for sandbox * separate ninja call for covert_dict * clean up universal build * change handling of rsp files, so they are generated during build and not configure time * refactor functions so universal build can be easily used by follow up qtpdf patch Change-Id: Id4a6c61b87fe76832232035fddf212b57051d0ec Reviewed-by: Allan Sandfeld Jensen (cherry picked from commit 58b787cbad581914367aea4604993cce30a65d06) Reviewed-by: Qt Cherry-pick Bot --- src/core/configure/rsp.cmake.in | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 src/core/configure/rsp.cmake.in (limited to 'src/core/configure/rsp.cmake.in') diff --git a/src/core/configure/rsp.cmake.in b/src/core/configure/rsp.cmake.in new file mode 100644 index 000000000..d24299007 --- /dev/null +++ b/src/core/configure/rsp.cmake.in @@ -0,0 +1,5 @@ +include(@CMAKE_FILE@) +list(JOIN @CONFIG@_NINJA_OBJECTS " " objects) +list(JOIN @CONFIG@_NINJA_ARCHIVES " " archives) +file(WRITE ${CMAKE_CURRENT_LIST_DIR}/@TARGET@_gnobjects.rsp ${objects}) +file(WRITE ${CMAKE_CURRENT_LIST_DIR}/@TARGET@_gnarchives.rsp ${archives}) -- cgit v1.2.3