kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'autorcc-qt-5.1-compat'

Browse Source 
e78fcc63 QtAutogen: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)
This commit is contained in:
Brad King 2015-10-29 08:42:22 -04:00 committed by CMake Topic Stage
commit b5d94065c0
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/cmQtAutoGeneratorInitializer.cxx
View File

@ -490,11 +490,30 @@ static std::string ListQt5RccInputs(cmSourceFile* sf,
{ {
std::string rccCommand std::string rccCommand
= GetRccExecutable(target); = GetRccExecutable(target);
bool hasDashDashList = false;
{
std::vector<std::string> command;
command.push_back(rccCommand);
command.push_back("--help");
std::string rccStdOut;
std::string rccStdErr;
int retVal = 0;
bool result = cmSystemTools::RunSingleCommand(
command, &rccStdOut, &rccStdErr,
&retVal, 0, cmSystemTools::OUTPUT_NONE);
if (result && retVal == 0 &&
rccStdOut.find("--list") != std::string::npos)
{
hasDashDashList = true;
}
}
std::vector<std::string> qrcEntries; std::vector<std::string> qrcEntries;
std::vector<std::string> command; std::vector<std::string> command;
command.push_back(rccCommand); command.push_back(rccCommand);
command.push_back("--list"); command.push_back(hasDashDashList? "--list" : "-list");
std::string absFile = cmsys::SystemTools::GetRealPath( std::string absFile = cmsys::SystemTools::GetRealPath(
sf->GetFullPath()); sf->GetFullPath());