feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

McuSupport: Set Kit's CMAKE_PREFIX_PATH for Desktop version

Browse Source 
... make sure that CMake really finds the right Qt installation

Change-Id: I90083e4522111eac9b3658f4351536cfc798bf98
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Aurindam Jana <aurindam.jana@qt.io>
This commit is contained in:
Alessandro Portale
2019-11-07 13:27:18 +01:00
committed by Aurindam Jana
parent cb908779a9
commit aaef25f708
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/mcusupport/mcusupportoptions.cpp
View File

@@ -517,8 +517,11 @@ static void setKitCMakeOptions(ProjectExplorer::Kit *k, const BoardOptions* boar
if (!board->qulPlatform().isEmpty()) if (!board->qulPlatform().isEmpty())
config.append(CMakeConfigItem("QUL_PLATFORM", config.append(CMakeConfigItem("QUL_PLATFORM",
board->qulPlatform().toUtf8())); 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")); config.append(CMakeConfigItem("QUL_COLOR_DEPTH", "32"));
}
CMakeConfigurationKitAspect::setConfiguration(k, config); CMakeConfigurationKitAspect::setConfiguration(k, config);
if (Utils::HostOsInfo::isWindowsHost()) if (Utils::HostOsInfo::isWindowsHost())
CMakeGeneratorKitAspect::setGenerator(k, "NMake Makefiles JOM"); CMakeGeneratorKitAspect::setGenerator(k, "NMake Makefiles JOM");