From d3583ba9c23daebe7ebbb489e379ce8eca7d4d13 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 31 Aug 2022 19:28:42 +0200 Subject: 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. Change-Id: I02937fc7101c249b22cfa06275c508410f888248 Reviewed-by: Allan Sandfeld Jensen Reviewed-by: Doris Verria Reviewed-by: Shawn Rutledge (cherry picked from commit 84eaa29b881d25f1b7588187b5b74a9da133d430) Reviewed-by: Qt Cherry-pick Bot --- src/CMakeLists.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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() -- cgit v1.2.3