diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2024-04-11 15:22:55 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2024-04-16 21:28:45 +0200 |
| commit | aeaaff1d5c3e3246d9cbf02499f1b952e9af8450 (patch) | |
| tree | 9521589d859e5c00b06177a3ea0770082bfe159a | |
| parent | 7aaa6a60448f5be05373367abaa37a1fa56ab5c7 (diff) | |
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.5 6.6 6.7
Change-Id: Ie502e2df999a204ab09d28322017be3c7ed8ebc5
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
| -rw-r--r-- | src/corelib/Qt6CoreMacros.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index e8da0f3e63..96e75fc3c0 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -1443,7 +1443,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( |