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

CMakePM: Add installDir CMakePresets support

Browse Source 
Is part of CMakePrests v3, and slipped at the implementation time.

Task-number: QTCREATORBUG-24555
Change-Id: Id3ce90c0a979d44287fc03ae1dd49a64e964cdf2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Cristian Adam
2022-10-20 16:22:28 +02:00
parent 430ff621aa
commit bf83f63a13
6 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/plugins/cmakeprojectmanager/presetsmacros.cpp
View File

@@ -253,6 +253,44 @@ void updateToolchainFile(
configurePreset.cacheVariables = cache;
}
void updateInstallDir(PresetsDetails::ConfigurePreset &configurePreset,
const Utils::Environment &env,
const Utils::FilePath &sourceDirectory)
{
if (!configurePreset.installDir)
return;
QString installDirString = configurePreset.installDir.value();
CMakePresets::Macros::expand(configurePreset, env, sourceDirectory, installDirString);
// Resolve the relative path first to source and afterwards to build directory
Utils::FilePath installDir = Utils::FilePath::fromString(installDirString);
if (installDir.isRelativePath()) {
Utils::FilePath probePath = sourceDirectory.resolvePath(installDir);
if (probePath != sourceDirectory) {
installDir = probePath;
}
}
installDirString = installDir.cleanPath().toString();
// installDir takes precedence to CMAKE_INSTALL_PREFIX
CMakeConfig cache = configurePreset.cacheVariables ? configurePreset.cacheVariables.value()
: CMakeConfig();
auto it = std::find_if(cache.begin(), cache.end(), [](const CMakeConfigItem &item) {
return item.key == "CMAKE_INSTALL_PREFIX";
});
if (it != cache.end())
it->value = installDirString.toUtf8();
else
cache << CMakeConfigItem("CMAKE_INSTALL_PREFIX",
CMakeConfigItem::PATH,
installDirString.toUtf8());
configurePreset.cacheVariables = cache;
}
template<class PresetType>
void expandConditionValues(const PresetType &preset,
const Utils::Environment &env,