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

Revert "CMake: Fix *-metatypes.json creation, take III"

Browse Source 
This reverts commit 654f3c5634ac9efc2257177351c8dea7c8d8875a.

That commit enabled a work-around for CMake upstream issue #19005 for
Visual Studio project generators. It turns out that this is not actually
needed, and that the work-around causes unnecessary rebuilds.

Fixes: QTBUG-121046
Pick-to: 6.6 6.5
Change-Id: Ie502e2df999a204ab09d28322017be3c7ed8ebc5
Reviewed-by:  Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit aeaaff1d5c3e3246d9cbf02499f1b952e9af8450)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Joerg Bornemann 2024-04-11 15:22:55 +02:00 committed by Qt Cherry-pick Bot
parent 363878499c
commit 169f53535a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/Qt6CoreMacros.cmake
View File

@ -1387,7 +1387,7 @@ function(qt6_extract_metatypes target)
VERBATIM VERBATIM
) )
if(CMAKE_GENERATOR MATCHES " Makefiles" OR CMAKE_GENERATOR MATCHES "^Visual Studio") if(CMAKE_GENERATOR MATCHES " Makefiles")
# Work around https://gitlab.kitware.com/cmake/cmake/-/issues/19005 to trigger the command # Work around https://gitlab.kitware.com/cmake/cmake/-/issues/19005 to trigger the command
# that generates ${metatypes_file}. # that generates ${metatypes_file}.
add_custom_command( add_custom_command(