From a035635f1fd901a94dc79c978ab5492be9d49fd6 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 13 Nov 2019 23:32:51 +0100 Subject: [PATCH] McuSupport: Add compilers to CMake configuration To get rid of the warning triangle on the kit icon, CMAKE_CXX_COMPILER and CMAKE_C_COMPILER get defined. Change-Id: I40ee47e4059e8986557609048f465972985e3d5b Reviewed-by: Alessandro Portale --- src/plugins/mcusupport/mcusupportoptions.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp index 916b8894879..8a639c6705f 100644 --- a/src/plugins/mcusupport/mcusupportoptions.cpp +++ b/src/plugins/mcusupport/mcusupportoptions.cpp @@ -533,6 +533,8 @@ static void setKitCMakeOptions(ProjectExplorer::Kit *k, const BoardOptions* boar using namespace CMakeProjectManager; CMakeConfig config = CMakeConfigurationKitAspect::configuration(k); + config.append(CMakeConfigItem("CMAKE_CXX_COMPILER", "%{Compiler:Executable:Cxx}")); + config.append(CMakeConfigItem("CMAKE_C_COMPILER", "%{Compiler:Executable:C}")); if (!board->toolChainFile().isEmpty()) config.append(CMakeConfigItem("CMAKE_TOOLCHAIN_FILE", (qulDir + "/" + board->toolChainFile()).toUtf8()));