1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add SKIP_LINTING for generated source files

Browse Source 
Since the `SKIP_LINTING` source property was added to upstream cmake
here https://gitlab.kitware.com/cmake/cmake/-/merge_requests/8467,
that source property should also be set for source files generated by
qt's cmake public api

Change-Id: Ic9d6c119abbc7c51b146176970c1d0bafb097abf
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Orkun Tokdemir 2023-05-30 15:09:33 +02:00
parent 2f273f5dfd
commit 443068dbba
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/corelib/Qt6CoreMacros.cmake
View File

@ -129,8 +129,12 @@ function(_qt_internal_create_moc_command infile outfile moc_flags moc_options
${_moc_working_dir} ${_moc_working_dir}
VERBATIM) VERBATIM)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTOMOC ON) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOMOC ON)
set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC ON) set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC ON
set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOUIC ON) SKIP_AUTOUIC ON
)
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.27")
set_source_files_properties(${outfile} PROPERTIES SKIP_LINTING ON)
endif()
endfunction() endfunction()
function(qt6_generate_moc infile outfile ) function(qt6_generate_moc infile outfile )
@ -442,6 +446,9 @@ function(qt6_add_big_resources outfiles )
_qt6_parse_qrc_file(${infile} _out_depends _rc_depends) _qt6_parse_qrc_file(${infile} _out_depends _rc_depends)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTOGEN ON) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOGEN ON)
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.27")
set_source_files_properties(${tmpoutfile} PROPERTIES SKIP_LINTING ON)
endif()
add_custom_command(OUTPUT ${tmpoutfile} add_custom_command(OUTPUT ${tmpoutfile}
COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::rcc ${rcc_options} --name ${outfilename} --pass 1 --output ${tmpoutfile} ${infile} COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::rcc ${rcc_options} --name ${outfilename} --pass 1 --output ${tmpoutfile} ${infile}
DEPENDS ${infile} ${_rc_depends} "${out_depends}" ${QT_CMAKE_EXPORT_NAMESPACE}::rcc DEPENDS ${infile} ${_rc_depends} "${out_depends}" ${QT_CMAKE_EXPORT_NAMESPACE}::rcc
@ -2047,6 +2054,9 @@ function(_qt_internal_process_resource target resourceName)
SKIP_UNITY_BUILD_INCLUSION TRUE SKIP_UNITY_BUILD_INCLUSION TRUE
SKIP_PRECOMPILE_HEADERS TRUE SKIP_PRECOMPILE_HEADERS TRUE
) )
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.27")
set_source_files_properties(${generatedOutfile} ${scope_args} PROPERTIES SKIP_LINTING ON)
endif()
get_target_property(target_source_dir ${target} SOURCE_DIR) get_target_property(target_source_dir ${target} SOURCE_DIR)
if(NOT target_source_dir STREQUAL CMAKE_CURRENT_SOURCE_DIR) if(NOT target_source_dir STREQUAL CMAKE_CURRENT_SOURCE_DIR)