diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2021-08-17 08:49:47 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2021-08-29 15:53:58 +0200 |
| commit | 96e47e1c9b6ce5c71e2560bb95f6e59ce062c8ba (patch) | |
| tree | 3836e8b776fe46d45316da148136851f2953f95a /src/pdf/CMakeLists.txt | |
| parent | 97eb62fe8ff83ae77103f5d8ae10debb1a5ff16b (diff) | |
Use rsp files directly from gn
Do not use gn created cmake files since this requires
cmake configuration step, which currently ends up
in duplicated targets in main and qtwebengine external
project. Use response files instead, so we can remove
duplicated targets in follow up patches. This approach
unfortunately has downside of cmake not being aware of
gn build artifacts and hacks directly linker command.
For universal builds remove not needed rsp template,
since we can now use rsp files directly generated by gn.
Task-number: QTBUG-95590
Pick-to: 6.2
Change-Id: I83282ba68fa171cada7236d0587be27122315dec
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/pdf/CMakeLists.txt')
| -rw-r--r-- | src/pdf/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/pdf/CMakeLists.txt b/src/pdf/CMakeLists.txt index b639b1243..12f01a73f 100644 --- a/src/pdf/CMakeLists.txt +++ b/src/pdf/CMakeLists.txt @@ -86,7 +86,9 @@ if(WEBENGINE_REPO_BUILD) read_gn_target(${buildGn} ${WEBENGINE_ROOT_BUILD_DIR}/src/pdf/${config}/gn_config.cxx.cmake) read_gn_target(${buildGn} ${WEBENGINE_ROOT_BUILD_DIR}/src/pdf/${config}/gn_config.c.cmake) configure_gn_target(${buildGn} ${config} - ${WEBENGINE_ROOT_SOURCE_DIR}/src/pdf/configure/BUILD.root.gn.in ${buildDir}/${config}/${arch}/BUILD.gn) + ${WEBENGINE_ROOT_SOURCE_DIR}/src/pdf/configure/BUILD.root.gn.in "${buildDir}/${config}/${arch}/BUILD.gn" + pdf/${config}/${arch} + ) ## # GN PARAMETERS @@ -157,5 +159,5 @@ if(WEBENGINE_REPO_BUILD) endforeach() set(arch ${CMAKE_SYSTEM_PROCESSOR}) target_include_directories(Pdf PRIVATE ${buildDir}/$<CONFIG>/${arch}/gen) - add_gn_build_aritfacts_to_target(Pdf QtPdf ON ${buildDir}) + add_gn_build_aritfacts_to_target(Pdf QtPdf ${buildDir}) endif() |