diff options
| author | Cristian Le <[email protected]> | 2025-03-05 11:27:25 +0100 |
|---|---|---|
| committer | Cristian Le <[email protected]> | 2025-06-27 20:29:16 +0200 |
| commit | 2f9795aba2f1f9ca5fbcca4581b2d89fc468cf07 (patch) | |
| tree | 11bf3605e84fec3b4f32f4201a149ea1f8d429b2 /cmake/QtModuleHelpers.cmake | |
| parent | 055985ec8373b8a1bd325468b5ba4f1c1de4eaed (diff) | |
Replace `QT_NO_CREATE_TARGETS` with an automated and scoped logic
Effectively check if we are importing while still building the current
project
Task-number: QTBUG-135233
Change-Id: If172617463157e84e1b16fc2354147fabae41084
Reviewed-by: Alexandru Croitor <[email protected]>
Reviewed-by: Alexey Edelev <[email protected]>
Diffstat (limited to 'cmake/QtModuleHelpers.cmake')
| -rw-r--r-- | cmake/QtModuleHelpers.cmake | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index d9f377a2baa..ecfdb740d71 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -1064,9 +1064,29 @@ function(qt_internal_write_basic_module_package target target_private) if(arg_PRIVATE) set(package_name "${INSTALL_CMAKE_NAMESPACE}${target_private}") set(module_config_input_file "QtModuleConfigPrivate.cmake.in") + qt_configure_file( + OUTPUT "${arg_CONFIG_BUILD_DIR}/${package_name}TargetsPrecheck.cmake" + CONTENT +" +_qt_internal_should_include_targets( + TARGETS ${target_private} + NAMESPACE ${INSTALL_CMAKE_NAMESPACE}:: + OUT_VAR_SHOULD_SKIP __qt_${target_private}_skip_include_targets_file +) +") else() set(package_name "${INSTALL_CMAKE_NAMESPACE}${target}") set(module_config_input_file "QtModuleConfig.cmake.in") + qt_configure_file( + OUTPUT "${arg_CONFIG_BUILD_DIR}/${package_name}TargetsPrecheck.cmake" + CONTENT +" +_qt_internal_should_include_targets( + TARGETS ${target} + NAMESPACE ${INSTALL_CMAKE_NAMESPACE}:: + OUT_VAR_SHOULD_SKIP __qt_${target}_skip_include_targets_file +) +") if(arg_FIND_PRIVATE_MODULE) set(always_load_private_module ON) endif() @@ -1110,6 +1130,7 @@ set(__qt_${target}_always_load_private_module ON) "${arg_CONFIG_BUILD_DIR}/${package_name}Config.cmake" "${arg_CONFIG_BUILD_DIR}/${package_name}ConfigVersion.cmake" "${arg_CONFIG_BUILD_DIR}/${package_name}ConfigVersionImpl.cmake" + "${arg_CONFIG_BUILD_DIR}/${package_name}TargetsPrecheck.cmake" DESTINATION "${arg_CONFIG_INSTALL_DIR}" COMPONENT Devel ) |