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

Merge topic 'minor-cleanup'

Browse Source 
e3b7eac Style: Don't put an else after a return.
ad304a2 cmSystemTools: Fix typo in comment.
08319e0 Genex: Fix indentation in docs.
This commit is contained in:
Brad King 2013-06-14 09:00:26 -04:00 committed by CMake Topic Stage
commit bbaae3e421
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmGeneratorExpressionEvaluator.cxx
View File

@ -266,8 +266,6 @@ struct CompilerIdNode : public cmGeneratorExpressionNode
{ {
return compilerId ? compilerId : ""; return compilerId ? compilerId : "";
} }
else
{
cmsys::RegularExpression compilerIdValidator; cmsys::RegularExpression compilerIdValidator;
compilerIdValidator.compile("^[A-Za-z0-9_]*$"); compilerIdValidator.compile("^[A-Za-z0-9_]*$");
if (!compilerIdValidator.find(parameters.begin()->c_str())) if (!compilerIdValidator.find(parameters.begin()->c_str()))
@ -287,7 +285,6 @@ struct CompilerIdNode : public cmGeneratorExpressionNode
} }
return "0"; return "0";
} }
}
}; };
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------

2
Source/cmSystemTools.h
View File

@ -274,7 +274,7 @@ public:
static bool GetRunCommandOutput() { return s_DisableRunCommandOutput; } static bool GetRunCommandOutput() { return s_DisableRunCommandOutput; }
/** /**
* Come constants for different file formats. * Some constants for different file formats.
*/ */
enum FileFormat { enum FileFormat {
NO_FILE_FORMAT = 0, NO_FILE_FORMAT = 0,