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

Rename the AutomocInfo.cmake file to be more generic.

This commit is contained in:
Stephen Kelly 2013-10-11 14:26:55 +02:00
parent a342c9ffed
commit ca124a1515
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Modules/AutomocInfo.cmake.in → Modules/AutogenInfo.cmake.in
View File

6
Source/cmQtAutoGenerators.cxx
View File

@ -429,9 +429,9 @@ void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget* target)
const char* cmakeRoot = makefile->GetSafeDefinition("CMAKE_ROOT"); const char* cmakeRoot = makefile->GetSafeDefinition("CMAKE_ROOT");
std::string inputFile = cmakeRoot; std::string inputFile = cmakeRoot;
inputFile += "/Modules/AutomocInfo.cmake.in"; inputFile += "/Modules/AutogenInfo.cmake.in";
std::string outputFile = targetDir; std::string outputFile = targetDir;
outputFile += "/AutomocInfo.cmake"; outputFile += "/AutogenInfo.cmake";
makefile->ConfigureFile(inputFile.c_str(), outputFile.c_str(), makefile->ConfigureFile(inputFile.c_str(), outputFile.c_str(),
false, true, false); false, true, false);
@ -519,7 +519,7 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(cmMakefile* makefile,
{ {
std::string filename(cmSystemTools::CollapseFullPath(targetDirectory)); std::string filename(cmSystemTools::CollapseFullPath(targetDirectory));
cmSystemTools::ConvertToUnixSlashes(filename); cmSystemTools::ConvertToUnixSlashes(filename);
filename += "/AutomocInfo.cmake"; filename += "/AutogenInfo.cmake";
if (!makefile->ReadListFile(0, filename.c_str())) if (!makefile->ReadListFile(0, filename.c_str()))
{ {