diff options
| author | Brad King <brad.king@kitware.com> | 2014-08-07 14:07:49 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-08-07 14:07:49 (GMT) |
| commit | df08d8575b56699c592ba8dec747dc7f6329b1b7 (patch) | |
| tree | b1790565a3efd27864616bd9b665c5c0ca1600b6 /Source/cmGeneratorExpressionEvaluator.cxx | |
| parent | 029edcdf3e713521f95ee9f2f41485d24e342c89 (diff) | |
| parent | c6acbc90630064aaac0d0c23ea4d7afaceac48db (diff) | |
| download | CMake-df08d8575b56699c592ba8dec747dc7f6329b1b7.zip CMake-df08d8575b56699c592ba8dec747dc7f6329b1b7.tar.gz CMake-df08d8575b56699c592ba8dec747dc7f6329b1b7.tar.bz2 | |
Merge topic 'genex-context-makefile-non-null'
c6acbc90 Genex: Remove unnecessary check of context->Makefile
Diffstat (limited to 'Source/cmGeneratorExpressionEvaluator.cxx')
| -rw-r--r-- | Source/cmGeneratorExpressionEvaluator.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx index 35a9fcb..70f33b7 100644 --- a/Source/cmGeneratorExpressionEvaluator.cxx +++ b/Source/cmGeneratorExpressionEvaluator.cxx @@ -394,9 +394,8 @@ struct CompilerIdNode : public cmGeneratorExpressionNode cmGeneratorExpressionDAGChecker *, const std::string &lang) const { - const char *compilerId = context->Makefile ? - context->Makefile->GetSafeDefinition( - "CMAKE_" + lang + "_COMPILER_ID") : ""; + const char *compilerId = + context->Makefile->GetSafeDefinition("CMAKE_" + lang + "_COMPILER_ID"); if (parameters.size() == 0) { return compilerId ? compilerId : ""; @@ -500,9 +499,8 @@ struct CompilerVersionNode : public cmGeneratorExpressionNode cmGeneratorExpressionDAGChecker *, const std::string &lang) const { - const char *compilerVersion = context->Makefile ? - context->Makefile->GetSafeDefinition( - "CMAKE_" + lang + "_COMPILER_VERSION") : ""; + const char *compilerVersion = context->Makefile->GetSafeDefinition( + "CMAKE_" + lang + "_COMPILER_VERSION"); if (parameters.size() == 0) { return compilerVersion ? compilerVersion : ""; @@ -583,9 +581,8 @@ struct PlatformIdNode : public cmGeneratorExpressionNode const GeneratorExpressionContent *, cmGeneratorExpressionDAGChecker *) const { - const char *platformId = context->Makefile ? - context->Makefile->GetSafeDefinition( - "CMAKE_SYSTEM_NAME") : ""; + const char *platformId = + context->Makefile->GetSafeDefinition("CMAKE_SYSTEM_NAME"); if (parameters.size() == 0) { return platformId ? platformId : ""; |