diff options
author | Jake Petroules <jake.petroules@qt.io> | 2017-02-06 19:41:31 -0800 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2017-02-07 19:23:16 +0000 |
commit | 152e5149e342befb47ba5ad47764be512dd17998 (patch) | |
tree | 45ca39168529f303a3b7df8684a0c38e2b022ebd /src/lib/corelib/generators | |
parent | 57800b73df97cd36927bc85f197bec42d7d9218a (diff) |
Generators: pass down full InstallOptions instead of just install root
This is needed for a followup patch to add environment handling.
Change-Id: Id492226c4b51646a97f7c2de1bb7e91dab512d32
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/lib/corelib/generators')
-rw-r--r-- | src/lib/corelib/generators/generator.cpp | 2 | ||||
-rw-r--r-- | src/lib/corelib/generators/generatordata.h | 3 | ||||
-rw-r--r-- | src/lib/corelib/generators/visualstudio/msbuildsharedsolutionpropertiesproject.cpp | 7 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/corelib/generators/generator.cpp b/src/lib/corelib/generators/generator.cpp index e167d7820..4f422ed0e 100644 --- a/src/lib/corelib/generators/generator.cpp +++ b/src/lib/corelib/generators/generator.cpp @@ -211,7 +211,7 @@ const GeneratableProject ProjectGenerator::project() const proj.data = p.data; proj.products = p.products; proj.subProjects = p.subProjects; - proj.installRoot = d->installOptions.installRoot(); + proj.installOptions = d->installOptions; return proj; } diff --git a/src/lib/corelib/generators/generatordata.h b/src/lib/corelib/generators/generatordata.h index b60e84b0e..369e70f06 100644 --- a/src/lib/corelib/generators/generatordata.h +++ b/src/lib/corelib/generators/generatordata.h @@ -44,6 +44,7 @@ #include <QMap> #include <api/project.h> #include <api/projectdata.h> +#include <tools/installoptions.h> namespace qbs { @@ -68,7 +69,7 @@ struct GeneratableProject : public GeneratableProjectData { GeneratableProjectMap projects; QMap<QString, QVariantMap> buildConfigurations; QMap<QString, QStringList> commandLines; - QString installRoot; + InstallOptions installOptions; QDir baseBuildDirectory() const; QFileInfo filePath() const; bool hasMultipleConfigurations() const; diff --git a/src/lib/corelib/generators/visualstudio/msbuildsharedsolutionpropertiesproject.cpp b/src/lib/corelib/generators/visualstudio/msbuildsharedsolutionpropertiesproject.cpp index cbf0d430d..6c47007b2 100644 --- a/src/lib/corelib/generators/visualstudio/msbuildsharedsolutionpropertiesproject.cpp +++ b/src/lib/corelib/generators/visualstudio/msbuildsharedsolutionpropertiesproject.cpp @@ -72,7 +72,8 @@ QString qbsCommandLine(const GeneratableProject &project, commandLine.appendArgument(QStringLiteral("--wait-lock")); } - if (realSubCommand == QStringLiteral("build") && !project.installRoot.isEmpty()) { + if (realSubCommand == QStringLiteral("build") + && !project.installOptions.installRoot().isEmpty()) { commandLine.appendArgument(QStringLiteral("--install-root")); addEnvironmentVariableArgument(commandLine, QStringLiteral("QbsInstallRoot")); } @@ -101,10 +102,10 @@ MSBuildSharedSolutionPropertiesProject::MSBuildSharedSolutionPropertiesProject( // Order's important here... a variable must be listed before one that uses it group->appendProperty(QStringLiteral("QbsExecutablePath"), QStringLiteral("$(QbsExecutableDir)") + qbsExecutable.fileName()); - if (!project.installRoot.isEmpty()) { + if (!project.installOptions.installRoot().isEmpty()) { group->appendProperty(QStringLiteral("QbsInstallRoot"), Internal::PathUtils::toNativeSeparators( - project.installRoot, + project.installOptions.installRoot(), Internal::HostOsInfo::HostOsWindows)); } |