diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2022-01-11 10:50:56 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-01-14 09:24:58 +0000 |
| commit | 7771a14582b35229a78ceb6b712658585ab56c21 (patch) | |
| tree | a9721957b56839a44238c0f1166109c58c1fe7a0 | |
| parent | 41a47f2099fda8bde8569669132c405c6b9ea63c (diff) | |
Fix moc path in case of top level cross build
Fixes: QTBUG-99511
Change-Id: I8b9550c8a7e331e319fc7784224571beef0410b1
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 3cfc627a19005d818a24398e410162484ef3b5b5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | cmake/Functions.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake index bc7703e63..3bdf86c83 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -79,7 +79,11 @@ function(create_cxx_config cmakeTarget arch configFileName) if(NOT QT_SUPERBUILD AND QT_WILL_INSTALL) get_target_property(mocFilePath Qt6::moc IMPORTED_LOCATION) else() - set(mocFilePath "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/moc${CMAKE_EXECUTABLE_SUFFIX}") + if(CMAKE_CROSSCOMPILING) + set(mocFilePath "${QT_HOST_PATH}/${INSTALL_LIBEXECDIR}/moc${CMAKE_EXECUTABLE_SUFFIX}") + else() + set(mocFilePath "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/moc${CMAKE_EXECUTABLE_SUFFIX}") + endif() endif() file(GENERATE OUTPUT $<CONFIG>/${arch}/${configFileName} |