From 169f53535a89e4b12d3841bf7fce89518b24cece Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 11 Apr 2024 15:22:55 +0200 Subject: [PATCH] Revert "CMake: Fix *-metatypes.json creation, take III" 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 (cherry picked from commit aeaaff1d5c3e3246d9cbf02499f1b952e9af8450) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/Qt6CoreMacros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 293eaeeaa38..31a1f1da030 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -1387,7 +1387,7 @@ function(qt6_extract_metatypes target) 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 # that generates ${metatypes_file}. add_custom_command(