diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2024-03-21 17:05:05 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2024-03-22 20:23:52 +0100 |
| commit | b84e7a6bb094e931810627d40c46faf897795655 (patch) | |
| tree | bd05b5691486d7777e36c3a8937b2a263adb1f7c | |
| parent | 51aa9c6163c90fecdf54012819750d14c36da5d4 (diff) | |
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.
Pick-to: 6.7
Change-Id: Id21df22cac832b618e98c25e0e134f4cf70ed9bd
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
| -rw-r--r-- | src/corelib/Qt6CoreMacros.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index dcd27ad611..f55e32a7cf 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -2073,7 +2073,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) @@ -2267,7 +2267,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) @@ -2364,9 +2364,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) @@ -2421,7 +2421,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} |