summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKai Köhne <kai.koehne@qt.io>2021-10-25 13:23:47 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-11-04 20:11:57 +0000
commit67a63567cafaf514d161dadbb6b5b055eea22afa (patch)
tree5bb5d16ab5ac9d18ddc1bac3a8e315dd442ff815 /src
parentec186cddb98419282856dad6efb0f7110514bc0d (diff)
Suppress rc.exe default output
Hide output like Microsoft (R) Windows (R) Resource Compiler Version 10.0.10011.16384 Copyright (C) Microsoft Corporation. All rights reserved. when building the auto-generated .rc files. Fixes: QTBUG-97729 Change-Id: Id0c32c8015ec2ac0b47b3add52d5c0f8a7a1c203 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 879e42cba8fe201f46f1234473ce6d0057875e8f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/Qt6CoreMacros.cmake12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake
index 7f61b90ccd..76eaf4e6bc 100644
--- a/src/corelib/Qt6CoreMacros.cmake
+++ b/src/corelib/Qt6CoreMacros.cmake
@@ -1298,9 +1298,16 @@ function(_qt_internal_generate_win32_rc_file target)
return()
endif()
+ if(MSVC)
+ set(extra_rc_flags "/nologo")
+ else()
+ set(extra_rc_flags)
+ endif()
+
if (target_rc_file)
# Use the provided RC file
target_sources(${target} PRIVATE "${target_rc_file}")
+ set_property(SOURCE ${target_rc_file} PROPERTY COMPILE_FLAGS "${extra_rc_flags}")
else()
# Generate RC File
set(rc_file_output "${target_binary_dir}/")
@@ -1488,8 +1495,9 @@ END
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${input}" "${output}"
)
# We can't rely on policy CMP0118 since user project controls it
- set_source_files_properties(${output} ${scope_args}
- PROPERTIES GENERATED TRUE
+ set_source_files_properties(${output} ${scope_args} PROPERTIES
+ GENERATED TRUE
+ COMPILE_FLAGS "${extra_rc_flags}"
)
target_sources(${end_target} PRIVATE "$<$<CONFIG:${cfg}>:${output}>")
endwhile()