diff options
author | Michal Klocek <michal.klocek@qt.io> | 2021-08-10 10:16:44 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-18 05:28:03 +0000 |
commit | 4245e8c147f3bc3512352b73462774c042426e81 (patch) | |
tree | f2b506169090417036d4b26e3b45b7647e1bb0e0 /src/core/configure/rsp.cmake.in | |
parent | 8f7e3291c4736c22d528da4c7f8cdbe28fe2d78f (diff) |
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 <allan.jensen@qt.io>
(cherry picked from commit 58b787cbad581914367aea4604993cce30a65d06)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/core/configure/rsp.cmake.in')
-rw-r--r-- | src/core/configure/rsp.cmake.in | 5 |
1 files changed, 5 insertions, 0 deletions
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}) |