From aaef25f70855bcf9c3c794b95fb1e44a2542f107 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 7 Nov 2019 13:27:18 +0100 Subject: [PATCH] McuSupport: Set Kit's CMAKE_PREFIX_PATH for Desktop version ... make sure that CMake really finds the right Qt installation Change-Id: I90083e4522111eac9b3658f4351536cfc798bf98 Reviewed-by: Cristian Adam Reviewed-by: Aurindam Jana --- src/plugins/mcusupport/mcusupportoptions.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp index b5088f36852..4352f49f1fd 100644 --- a/src/plugins/mcusupport/mcusupportoptions.cpp +++ b/src/plugins/mcusupport/mcusupportoptions.cpp @@ -517,8 +517,11 @@ static void setKitCMakeOptions(ProjectExplorer::Kit *k, const BoardOptions* boar if (!board->qulPlatform().isEmpty()) config.append(CMakeConfigItem("QUL_PLATFORM", board->qulPlatform().toUtf8())); - if (isDesktop(board)) // TODO: Hack! Implement color depth variants of all targets + if (isDesktop(board)) { + config.append(CMakeConfigItem("CMAKE_PREFIX_PATH", "%{Qt:QT_INSTALL_PREFIX}")); + // TODO: Hack! Implement color depth variants of all targets config.append(CMakeConfigItem("QUL_COLOR_DEPTH", "32")); + } CMakeConfigurationKitAspect::setConfiguration(k, config); if (Utils::HostOsInfo::isWindowsHost()) CMakeGeneratorKitAspect::setGenerator(k, "NMake Makefiles JOM");