From 2fb9ac0de87a157f2e5537556ab9313022091d90 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 21 Mar 2024 17:05:05 +0100 Subject: [PATCH] CMake: Move various rcc generated files into .qt subdirectory So we have a single central location for all generated files. [ChangeLog][Build System] Generated resource files (and supporting files) will now be placed into the .qt/rcc subdirectory of a project build dir. The location is an implementation detail that might still change in the future, so it should not be relied upon. Change-Id: Id21df22cac832b618e98c25e0e134f4cf70ed9bd Reviewed-by: Alexey Edelev (cherry picked from commit b84e7a6bb094e931810627d40c46faf897795655) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/Qt6CoreMacros.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 019f9b4df94..293eaeeaa38 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -2017,7 +2017,7 @@ function(__qt_internal_generate_init_resource_source_file out_var target resourc # Gets replaced in the template __qt_internal_sanitize_resource_name(RESOURCE_NAME "${resource_name}") - set(resource_init_path "${CMAKE_CURRENT_BINARY_DIR}/.rcc/qrc_${resource_name}_init.cpp") + set(resource_init_path "${CMAKE_CURRENT_BINARY_DIR}/.qt/rcc/qrc_${resource_name}_init.cpp") configure_file("${template_file}" "${resource_init_path}" @ONLY) @@ -2211,7 +2211,7 @@ function(_qt_internal_process_resource target resourceName) endif() return() endif() - set(generatedResourceFile "${CMAKE_CURRENT_BINARY_DIR}/.rcc/${resourceName}.qrc") + set(generatedResourceFile "${CMAKE_CURRENT_BINARY_DIR}/.qt/rcc/${resourceName}.qrc") _qt_internal_expose_source_file_to_ide(${target} ${generatedResourceFile}) set_source_files_properties(${generatedResourceFile} PROPERTIES GENERATED TRUE) @@ -2308,9 +2308,9 @@ function(_qt_internal_process_resource target resourceName) endif() endif() elseif(rcc_BIG_RESOURCES) - set(generatedOutfile "${CMAKE_CURRENT_BINARY_DIR}/.rcc/qrc_${resourceName}_tmp.cpp") + set(generatedOutfile "${CMAKE_CURRENT_BINARY_DIR}/.qt/rcc/qrc_${resourceName}_tmp.cpp") else() - set(generatedOutfile "${CMAKE_CURRENT_BINARY_DIR}/.rcc/qrc_${resourceName}.cpp") + set(generatedOutfile "${CMAKE_CURRENT_BINARY_DIR}/.qt/rcc/qrc_${resourceName}.cpp") endif() set(pass_msg) @@ -2365,7 +2365,7 @@ function(_qt_internal_process_resource target resourceName) if(rcc_BIG_RESOURCES) set(pass1OutputFile ${generatedOutfile}) set(generatedOutfile - "${CMAKE_CURRENT_BINARY_DIR}/.rcc/qrc_${resourceName}${CMAKE_CXX_OUTPUT_EXTENSION}") + "${CMAKE_CURRENT_BINARY_DIR}/.qt/rcc/qrc_${resourceName}${CMAKE_CXX_OUTPUT_EXTENSION}") _qt_internal_add_rcc_pass2( RESOURCE_NAME ${resourceName} RCC_OPTIONS ${rccArgsAllPasses}