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

Merge topic 'genex-context-makefile-non-null' 

c6acbc90 Genex: Remove unnecessary check of context->Makefile
This commit is contained in:
Brad King 2014-08-07 10:07:49 -04:00 committed by CMake Topic Stage
parent 029edcdf3e c6acbc9063
commit df08d8575b
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmGeneratorExpressionEvaluator.cxx
View File

@ -394,9 +394,8 @@ struct CompilerIdNode : public cmGeneratorExpressionNode
cmGeneratorExpressionDAGChecker *, cmGeneratorExpressionDAGChecker *,
const std::string &lang) const const std::string &lang) const
{ {
const char *compilerId = context->Makefile ? const char *compilerId =
context->Makefile->GetSafeDefinition( context->Makefile->GetSafeDefinition("CMAKE_" + lang + "_COMPILER_ID");
"CMAKE_" + lang + "_COMPILER_ID") : "";
if (parameters.size() == 0) if (parameters.size() == 0)
{ {
return compilerId ? compilerId : ""; return compilerId ? compilerId : "";
@ -500,9 +499,8 @@ struct CompilerVersionNode : public cmGeneratorExpressionNode
cmGeneratorExpressionDAGChecker *, cmGeneratorExpressionDAGChecker *,
const std::string &lang) const const std::string &lang) const
{ {
const char *compilerVersion = context->Makefile ? const char *compilerVersion = context->Makefile->GetSafeDefinition(
context->Makefile->GetSafeDefinition( "CMAKE_" + lang + "_COMPILER_VERSION");
"CMAKE_" + lang + "_COMPILER_VERSION") : "";
if (parameters.size() == 0) if (parameters.size() == 0)
{ {
return compilerVersion ? compilerVersion : ""; return compilerVersion ? compilerVersion : "";
@ -583,9 +581,8 @@ struct PlatformIdNode : public cmGeneratorExpressionNode
const GeneratorExpressionContent *, const GeneratorExpressionContent *,
cmGeneratorExpressionDAGChecker *) const cmGeneratorExpressionDAGChecker *) const
{ {
const char *platformId = context->Makefile ? const char *platformId =
context->Makefile->GetSafeDefinition( context->Makefile->GetSafeDefinition("CMAKE_SYSTEM_NAME");
"CMAKE_SYSTEM_NAME") : "";
if (parameters.size() == 0) if (parameters.size() == 0)
{ {
return platformId ? platformId : ""; return platformId ? platformId : "";