reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-28 14:01:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Autogen: MakeParentDirectory logPrefix parameter

Browse Source
This commit is contained in:
Sebastian Holtermann 2017-04-22 13:30:28 +02:00
parent 5965a58915
commit 344a6d8448
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/cmQtAutoGenerators.cxx
View File

@ -1148,7 +1148,7 @@ bool cmQtAutoGenerators::MocGenerateAll(
// Generate moc_predefs
if (!this->MocPredefsCmd.empty()) {
if (!this->MakeParentDirectory(this->MocPredefsFileAbs)) {
if (!this->MakeParentDirectory("AutoMoc", this->MocPredefsFileAbs)) {
this->LogError("AutoMoc: Error creating directory for " +
this->MocPredefsFileRel);
return false;
@ -1275,7 +1275,7 @@ bool cmQtAutoGenerators::MocGenerateAll(
this->LogBold("Generating MOC compilation " + this->MocCppFilenameRel);
// Make sure the parent directory exists
success = this->MakeParentDirectory(this->MocCppFilenameAbs);
success = this->MakeParentDirectory("AutoMoc", this->MocCppFilenameAbs);
if (success) {
cmsys::ofstream outfile;
outfile.open(this->MocCppFilenameAbs.c_str(), std::ios::trunc);
@ -1340,7 +1340,7 @@ bool cmQtAutoGenerators::MocGenerateFile(
this->LogBold("Generating MOC source " + mocFileRel);
// Make sure the parent directory exists
if (this->MakeParentDirectory(mocFileAbs)) {
if (this->MakeParentDirectory("AutoMoc", mocFileAbs)) {
// Compose moc command
std::vector<std::string> cmd;
cmd.push_back(this->MocExecutable);
@ -1516,7 +1516,7 @@ bool cmQtAutoGenerators::UicGenerateFile(const std::string& realName,
this->LogBold("Generating UIC header " + uicFileRel);
// Make sure the parent directory exists
if (this->MakeParentDirectory(uicFileAbs)) {
if (this->MakeParentDirectory("AutoUic", uicFileAbs)) {
// Compose uic command
std::vector<std::string> cmd;
cmd.push_back(this->UicExecutable);
@ -1654,7 +1654,7 @@ bool cmQtAutoGenerators::RccGenerateFile(const std::string& rccInputFile,
this->LogBold("Generating RCC source " + rccOutputFile);
// Make sure the parent directory exists
if (this->MakeParentDirectory(rccBuildFile)) {
if (this->MakeParentDirectory("AutoRcc", rccBuildFile)) {
// Compose symbol name
std::string symbolName =
cmsys::SystemTools::GetFilenameWithoutLastExtension(rccInputFile);
@ -1839,14 +1839,18 @@ std::string cmQtAutoGenerators::ChecksumedPath(const std::string& sourceFile,
* @brief Generates the parent directory of the given file on demand
* @return True on success
*/
bool cmQtAutoGenerators::MakeParentDirectory(const std::string& filename) const
bool cmQtAutoGenerators::MakeParentDirectory(const char* logPrefix,
const std::string& filename) const
{
bool success = true;
const std::string dirName = cmSystemTools::GetFilenamePath(filename);
if (!dirName.empty()) {
success = cmsys::SystemTools::MakeDirectory(dirName);
if (!success) {
this->LogError("AutoGen: Error: Directory creation failed: " + dirName);
std::string error = logPrefix;
error += ": Error: Parent directory creation failed for ";
error += Quoted(filename);
this->LogError(error);
}
}
return success;

3
Source/cmQtAutoGenerators.h
View File

@ -141,7 +141,8 @@ private:
std::string ChecksumedPath(const std::string& sourceFile,
const char* basePrefix,
const char* baseSuffix) const;
bool MakeParentDirectory(const std::string& filename) const;
bool MakeParentDirectory(const char* logPrefix,
const std::string& filename) const;
bool RunCommand(const std::vector<std::string>& command, std::string& output,
bool verbose = true) const;