mirror of
https://gitlab.kitware.com/cmake/cmake.git
synced 2026-10-07 04:02:23 +03:00
cmInstallScriptHandler: Now handles adding the component to install
This commit is contained in:
1 parent
fbc91a7c7a
commit
f059d95484
2 files changed
+5
-4
No files matched your search
@@ -47,6 +47,11 @@ cmInstallScriptHandler::cmInstallScriptHandler(std::string _binaryDir,
|
||||
auto addScript = [this, &args](std::string script,
|
||||
std::string config) -> void {
|
||||
this->scripts.push_back({ script, config, args });
|
||||
if (!this->component.empty()) {
|
||||
this->scripts.back().command.insert(
|
||||
this->scripts.back().command.end() - 1,
|
||||
cmStrCat("-DCMAKE_INSTALL_COMPONENT=", this->component));
|
||||
}
|
||||
if (!config.empty()) {
|
||||
this->scripts.back().command.insert(
|
||||
this->scripts.back().command.end() - 1,
|
||||
|
||||
@@ -896,10 +896,6 @@ int do_install(int ac, char const* const* av)
|
||||
args.emplace_back("-DCMAKE_INSTALL_PREFIX=" + prefix);
|
||||
}
|
||||
|
||||
if (!component.empty()) {
|
||||
args.emplace_back("-DCMAKE_INSTALL_COMPONENT=" + component);
|
||||
}
|
||||
|
||||
if (strip) {
|
||||
args.emplace_back("-DCMAKE_INSTALL_DO_STRIP=1");
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user