From 2433d02856bb55150d62d84b71b7d8a90c0ce81f Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Mon, 24 Feb 2025 15:22:35 +0100 Subject: [PATCH] Make `AdditionalTargetInfo.cmake` optional Pick-to: 6.8 6.9 Change-Id: I8b8d6383b6c50e9403bc90e76d4da8eb6c314854 Reviewed-by: Alexey Edelev Reviewed-by: Joerg Bornemann Reviewed-by: Alexandru Croitor --- cmake/QtModuleConfig.cmake.in | 3 ++- cmake/QtModuleHelpers.cmake | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/QtModuleConfig.cmake.in b/cmake/QtModuleConfig.cmake.in index e9fee8a0d5a..e3af0299c57 100644 --- a/cmake/QtModuleConfig.cmake.in +++ b/cmake/QtModuleConfig.cmake.in @@ -26,7 +26,8 @@ endif() if (NOT QT_NO_CREATE_TARGETS AND @INSTALL_CMAKE_NAMESPACE@@target@_FOUND) include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@Targets.cmake") - include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@AdditionalTargetInfo.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@AdditionalTargetInfo.cmake" + OPTIONAL) include("${CMAKE_CURRENT_LIST_DIR}/@INSTALL_CMAKE_NAMESPACE@@target@ExtraProperties.cmake" OPTIONAL) endif() diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index 98ebdaed137..7f9b58dbba1 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -82,7 +82,6 @@ endfunction() # Options: # NO_ADDITIONAL_TARGET_INFO # Don't generate a Qt6*AdditionalTargetInfo.cmake file. -# The caller is responsible for creating one. # # MODULE_INTERFACE_NAME # The custom name of the module interface. This name is used as a part of the include paths