mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-29 18:51:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'cpack-install-multiple-configurations'

Browse Source 
da5ac4bb60 cpack: Add `CPACK_INSTALL_CMAKE_CONFIGURATIONS` variable
d4e6b2ae25 Refactor: Use `unique_ptr` instead of raw pointer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3533
This commit is contained in:
Brad King
2019-09-03 13:29:57 +00:00
committed by Kitware Robot
parent d615ce4386 da5ac4bb60
commit 2e6effd2e0
8 changed files with 84 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/CPack/cmCPackGenerator.cxx
+49 -21
View File
@@ -594,11 +594,37 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
componentsVector.push_back(project.Component);
}
const char* buildConfigCstr = this->GetOption("CPACK_BUILD_CONFIG");
std::string buildConfig = buildConfigCstr ? buildConfigCstr : "";
cmGlobalGenerator* globalGenerator =
std::vector<std::string> buildConfigs;
// Try get configuration names given via `-C` CLI option
{
const char* const buildConfigCstr =
this->GetOption("CPACK_BUILD_CONFIG");
auto buildConfig = buildConfigCstr ? buildConfigCstr : std::string{};
cmExpandList(buildConfig, buildConfigs);
}
// Try get configurations requested by the user explicitly
{
const char* const configsCstr =
this->GetOption("CPACK_INSTALL_CMAKE_CONFIGURATIONS");
auto configs = configsCstr ? configsCstr : std::string{};
cmExpandList(configs, buildConfigs);
}
// Remove duplicates
std::sort(buildConfigs.begin(), buildConfigs.end());
buildConfigs.erase(std::unique(buildConfigs.begin(), buildConfigs.end()),
buildConfigs.end());
// Ensure we have at least one configuration.
if (buildConfigs.empty()) {
buildConfigs.emplace_back();
}
std::unique_ptr<cmGlobalGenerator> globalGenerator(
this->MakefileMap->GetCMakeInstance()->CreateGlobalGenerator(
cmakeGenerator);
cmakeGenerator));
if (!globalGenerator) {
cmCPackLogger(cmCPackLog::LOG_ERROR,
"Specified package generator not found. "
@@ -611,27 +637,29 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
// on windows.
cmSystemTools::SetForceUnixPaths(globalGenerator->GetForceUnixPaths());
if (!this->RunPreinstallTarget(project.ProjectName, project.Directory,
globalGenerator, buildConfig)) {
return 0;
}
delete globalGenerator;
cmCPackLogger(cmCPackLog::LOG_OUTPUT,
"- Install project: " << project.ProjectName << std::endl);
// Run the installation for each component
for (std::string const& component : componentsVector) {
if (!this->InstallCMakeProject(
setDestDir, project.Directory, baseTempInstallDirectory,
default_dir_mode, component, componentInstall,
project.SubDirectory, buildConfig, absoluteDestFiles)) {
// Run the installation for the selected build configurations
for (auto const& buildConfig : buildConfigs) {
if (!this->RunPreinstallTarget(project.ProjectName, project.Directory,
globalGenerator.get(), buildConfig)) {
return 0;
}
cmCPackLogger(cmCPackLog::LOG_OUTPUT,
"- Install project: " << project.ProjectName << " ["
<< buildConfig << ']'
<< std::endl);
// Run the installation for each component
for (std::string const& component : componentsVector) {
if (!this->InstallCMakeProject(
setDestDir, project.Directory, baseTempInstallDirectory,
default_dir_mode, component, componentInstall,
project.SubDirectory, buildConfig, absoluteDestFiles)) {
return 0;
}
}
}
this->CMakeProjects.push_back(project);
this->CMakeProjects.emplace_back(std::move(project));
}
}
this->SetOption("CPACK_ABSOLUTE_DESTINATION_FILES",