diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2022-08-31 19:28:42 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2022-09-06 14:09:33 +0000 |
| commit | 512832e58a228a108606aa6cdb7bae8c77fac0ef (patch) | |
| tree | b3bd59fafb153f56d293add038445114afae0895 | |
| parent | 2688ab3da929905c5ce87b55cd8b3a911e0a7331 (diff) | |
| download | qtwebengine-512832e58a228a108606aa6cdb7bae8c77fac0ef.tar.gz | |
Copy gn in case for crossbuild
In case of non prefix builds gn should be copied so
it can be detected by cross-build from host qt.
Pick-to: 6.4 6.3
Change-Id: I02937fc7101c249b22cfa06275c508410f888248
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
(cherry picked from commit 84eaa29b881d25f1b7588187b5b74a9da133d430)
| -rw-r--r-- | src/CMakeLists.txt | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e7600542e..0cbb9cfd6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -191,5 +191,22 @@ if((LINUX OR MACOS) AND INSTALL_GN) CONFIGURATIONS ${installConfig} RUNTIME DESTINATION "${INSTALL_LIBEXECDIR}" ) + if(NOT QT_WILL_INSTALL) + add_custom_target(copy-gn ALL DEPENDS + ${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/gn + ) + if(Gn_FOUND) + set(copyDep ${installDir/bin/gn}) + else() + set(copyDep gn) + endif() + add_custom_command( + OUTPUT ${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/gn + COMMAND ${CMAKE_COMMAND} -E copy ${installDir}/bin/gn + ${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR} + DEPENDS ${copyDep} + USES_TERMINAL + ) + endif() endif() |