parent
72caf4d178
commit
58b7fe6545
|
@ -405,7 +405,7 @@ bool cmQtAutomoc::RunAutomocQt4()
|
||||||
const std::string &absFilename = *it;
|
const std::string &absFilename = *it;
|
||||||
if (this->Verbose)
|
if (this->Verbose)
|
||||||
{
|
{
|
||||||
printf("Checking -%s-\n", absFilename.c_str());
|
std::cout << "AUTOMOC: Checking " << absFilename << std::endl;
|
||||||
}
|
}
|
||||||
this->ParseCppFile(absFilename, includedMocs, notIncludedMocs);
|
this->ParseCppFile(absFilename, includedMocs, notIncludedMocs);
|
||||||
}
|
}
|
||||||
|
@ -419,7 +419,7 @@ bool cmQtAutomoc::RunAutomocQt4()
|
||||||
const std::string &absFilename = *it;
|
const std::string &absFilename = *it;
|
||||||
if (this->Verbose)
|
if (this->Verbose)
|
||||||
{
|
{
|
||||||
printf("Checking -%s-\n", absFilename.c_str());
|
std::cout << "AUTOMOC: Checking " << absFilename << std::endl;
|
||||||
}
|
}
|
||||||
if (includedMocs.find(absFilename) == includedMocs.end()
|
if (includedMocs.find(absFilename) == includedMocs.end()
|
||||||
&& notIncludedMocs.find(absFilename) == notIncludedMocs.end())
|
&& notIncludedMocs.find(absFilename) == notIncludedMocs.end())
|
||||||
|
@ -527,7 +527,7 @@ void cmQtAutomoc::ParseCppFile(const std::string& absFilename,
|
||||||
const std::string contentsString = this->ReadAll(absFilename);
|
const std::string contentsString = this->ReadAll(absFilename);
|
||||||
if (contentsString.empty())
|
if (contentsString.empty())
|
||||||
{
|
{
|
||||||
std::cerr << "automoc4: empty source file: " << absFilename << std::endl;
|
std::cerr << "AUTOMOC: empty source file: " << absFilename << std::endl;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const std::string absPath = cmsys::SystemTools::GetFilenamePath(
|
const std::string absPath = cmsys::SystemTools::GetFilenamePath(
|
||||||
|
@ -648,7 +648,7 @@ void cmQtAutomoc::ParseCppFile(const std::string& absFilename,
|
||||||
}
|
}
|
||||||
if (!headerFound)
|
if (!headerFound)
|
||||||
{
|
{
|
||||||
std::cerr << "automoc4: The file \"" << absFilename
|
std::cerr << "AUTOMOC: The file \"" << absFilename
|
||||||
<< "\" includes the moc file \"" << currentMoc
|
<< "\" includes the moc file \"" << currentMoc
|
||||||
<< "\", but neither \"" << absPath << basename
|
<< "\", but neither \"" << absPath << basename
|
||||||
<< '{' << this->Join(headerExtensions, ',')
|
<< '{' << this->Join(headerExtensions, ',')
|
||||||
|
@ -660,7 +660,7 @@ void cmQtAutomoc::ParseCppFile(const std::string& absFilename,
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
std::cerr << "automoc4: The file \"" << absFilename
|
std::cerr << "AUTOMOC: The file \"" << absFilename
|
||||||
<< "\" includes the moc file \"" << currentMoc
|
<< "\" includes the moc file \"" << currentMoc
|
||||||
<< "\", but \"" << absPath << basename << '{'
|
<< "\", but \"" << absPath << basename << '{'
|
||||||
<< this->Join(headerExtensions, ',') << '}'
|
<< this->Join(headerExtensions, ',') << '}'
|
||||||
|
@ -728,9 +728,9 @@ bool cmQtAutomoc::GenerateMoc(const std::string& sourceFile,
|
||||||
{
|
{
|
||||||
for(int i=0; i<command.size(); i++)
|
for(int i=0; i<command.size(); i++)
|
||||||
{
|
{
|
||||||
printf("%s ", command[i].c_str());
|
std::cout << command[i] << " ";
|
||||||
}
|
}
|
||||||
printf("\n");
|
std::cout << std::endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string output;
|
std::string output;
|
||||||
|
@ -738,7 +738,7 @@ bool cmQtAutomoc::GenerateMoc(const std::string& sourceFile,
|
||||||
bool result = cmSystemTools::RunSingleCommand(command, &output, &retVal);
|
bool result = cmSystemTools::RunSingleCommand(command, &output, &retVal);
|
||||||
if (!result || retVal)
|
if (!result || retVal)
|
||||||
{
|
{
|
||||||
std::cerr << "automoc4: process for " << mocFilePath << " failed:\n"
|
std::cerr << "AUTOMOC: process for " << mocFilePath << " failed:\n"
|
||||||
<< output << std::endl;
|
<< output << std::endl;
|
||||||
this->RunMocFailed = true;
|
this->RunMocFailed = true;
|
||||||
cmSystemTools::RemoveFile(mocFilePath.c_str());
|
cmSystemTools::RemoveFile(mocFilePath.c_str());
|
||||||
|
|
Loading…
Reference in New Issue