|
@@ -1613,13 +1613,17 @@ void cmQtAutoGenInitializer::AddCMakeProcessToCommandLines(
|
|
|
std::string const& infoFile, std::string const& processName,
|
|
|
cmCustomCommandLines& commandLines)
|
|
|
{
|
|
|
+ std::vector<std::string> autogenConfigs;
|
|
|
+ this->GlobalGen->GetQtAutoGenConfigs(autogenConfigs);
|
|
|
if (this->CrossConfig && this->UseBetterGraph) {
|
|
|
commandLines.push_back(cmMakeCommandLine(
|
|
|
{ cmSystemTools::GetCMakeCommand(), "-E", processName, infoFile,
|
|
|
"$<CONFIG>", "$<COMMAND_CONFIG:$<CONFIG>>" }));
|
|
|
} else if ((this->MultiConfig && this->GlobalGen->IsXcode()) ||
|
|
|
this->CrossConfig) {
|
|
|
- for (std::string const& config : this->ConfigsList) {
|
|
|
+ const auto& configs =
|
|
|
+ processName == "cmake_autorcc" ? this->ConfigsList : autogenConfigs;
|
|
|
+ for (std::string const& config : configs) {
|
|
|
commandLines.push_back(
|
|
|
cmMakeCommandLine({ cmSystemTools::GetCMakeCommand(), "-E",
|
|
|
processName, infoFile, config }));
|
|
@@ -1629,9 +1633,7 @@ void cmQtAutoGenInitializer::AddCMakeProcessToCommandLines(
|
|
|
if (this->MultiConfig) {
|
|
|
autoInfoFileConfig = "$<CONFIG>";
|
|
|
} else {
|
|
|
- std::vector<std::string> configs;
|
|
|
- this->GlobalGen->GetQtAutoGenConfigs(configs);
|
|
|
- autoInfoFileConfig = configs[0];
|
|
|
+ autoInfoFileConfig = autogenConfigs[0];
|
|
|
}
|
|
|
commandLines.push_back(
|
|
|
cmMakeCommandLine({ cmSystemTools::GetCMakeCommand(), "-E", processName,
|