From 60e03d480570123acf72c32a697f59bd8ed5d493 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Tue, 14 Mar 2023 17:12:51 +0100 Subject: CMakePM: Do not pass QTC_KIT_DEFAULT_CONFIG_HASH to configure QTC_KIT_DEFAULT_CONFIG_HASH is used to match CMake presets kits and should not pass to the CMake configuration. Change-Id: I27caedf03f94c1e864f16d1f735e2edbabbfe871 Reviewed-by: Alessandro Portale --- src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 127e572110..fb3a098e54 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -1177,6 +1177,12 @@ static void addCMakeConfigurePresetToInitialArguments(QStringList &initialArgume initialArguments.removeIf( [presetArgument](const QString &item) { return item == presetArgument; }); + // Remove the -DQTC_KIT_DEFAULT_CONFIG_HASH argument + const QString presetHashArgument + = CMakeConfigurationKitAspect::kitDefaultConfigHashItem(k).toArgument(); + initialArguments.removeIf( + [presetHashArgument](const QString &item) { return item == presetHashArgument; }); + PresetsDetails::ConfigurePreset configurePreset = Utils::findOrDefault(project->presetsData().configurePresets, [presetName](const PresetsDetails::ConfigurePreset &preset) { -- cgit v1.2.3