From c733f89eaf0c6bf70ab35666a4ef38490abca828 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Thu, 30 Sep 2021 08:09:21 +0200 Subject: Fix setup for 'no-prefix' builds QT_SUPERBUILD is never cached and user can run only qtbase as super build and compile any other module as separate module build, moreover this can be also 'no prefix' build. Fix missing checks to support that case and clean up install of resources. For mac framework builds copy bundle to right place in case of 'no-prefix' builds. Fixes: QTBUG-94604 Task-number: QTBUG-96375 Pick-to: 6.2 Change-Id: I4ab7d4fed2c2be93f2a048a510419849361883ba Reviewed-by: Allan Sandfeld Jensen --- cmake/Functions.cmake | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'cmake') diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake index 19d6b0ca0..6c7a49415 100644 --- a/cmake/Functions.cmake +++ b/cmake/Functions.cmake @@ -76,7 +76,7 @@ function(get_qt_features outList module) endfunction() function(create_cxx_config cmakeTarget arch configFileName) - if(NOT QT_SUPERBUILD) + 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}") @@ -1034,6 +1034,16 @@ function(addCopyCommand target src dst) ) endfunction() +function(addCopyDirCommand target src dst) + add_custom_command( + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory ${src} ${dst} + TARGET ${target} + DEPENDS ${src} + USES_TERMINAL + ) +endfunction() + function(check_for_ulimit) message("-- Checking 'ulimit -n'") execute_process(COMMAND bash -c "ulimit -n" -- cgit v1.2.1