diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-16 14:47:00 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-16 14:47:14 (GMT) |
| commit | 68a30b50a5894d0425122ae4bbfd40b0492ff116 (patch) | |
| tree | 682f3fc0372fa0a287ca027f07eda2930e643a8e /Source/cmGeneratorExpressionEvaluationFile.cxx | |
| parent | 7721b70e231c94188a8f5643fddad661fe6f1eb1 (diff) | |
| parent | cc2a5261f82c21e15899bba0d9b508fcacda7879 (diff) | |
| download | CMake-68a30b50a5894d0425122ae4bbfd40b0492ff116.zip CMake-68a30b50a5894d0425122ae4bbfd40b0492ff116.tar.gz CMake-68a30b50a5894d0425122ae4bbfd40b0492ff116.tar.bz2 | |
Merge topic 'messenger-no-cmake'
cc2a5261f8 Factor out enum MessageType into dedicated header
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2654
Diffstat (limited to 'Source/cmGeneratorExpressionEvaluationFile.cxx')
| -rw-r--r-- | Source/cmGeneratorExpressionEvaluationFile.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx b/Source/cmGeneratorExpressionEvaluationFile.cxx index e7a55e0..1c33a6e 100644 --- a/Source/cmGeneratorExpressionEvaluationFile.cxx +++ b/Source/cmGeneratorExpressionEvaluationFile.cxx @@ -12,10 +12,10 @@ #include "cmListFileCache.h" #include "cmLocalGenerator.h" #include "cmMakefile.h" +#include "cmMessageType.h" #include "cmSourceFile.h" #include "cmSourceFileLocationKind.h" #include "cmSystemTools.h" -#include "cmake.h" cmGeneratorExpressionEvaluationFile::cmGeneratorExpressionEvaluationFile( const std::string& input, @@ -48,7 +48,7 @@ void cmGeneratorExpressionEvaluationFile::Generate( << "\" did " "not evaluate to valid content. Got \"" << condResult << "\"."; - lg->IssueMessage(cmake::FATAL_ERROR, e.str()); + lg->IssueMessage(MessageType::FATAL_ERROR, e.str()); return; } } @@ -77,7 +77,7 @@ void cmGeneratorExpressionEvaluationFile::Generate( "This is generally caused by the content evaluating the " "configuration type, language, or location of object files:\n " << outputFileName; - lg->IssueMessage(cmake::FATAL_ERROR, e.str()); + lg->IssueMessage(MessageType::FATAL_ERROR, e.str()); return; } @@ -137,7 +137,7 @@ void cmGeneratorExpressionEvaluationFile::Generate(cmLocalGenerator* lg) if (!fin) { std::ostringstream e; e << "Evaluation file \"" << inputFileName << "\" cannot be read."; - lg->IssueMessage(cmake::FATAL_ERROR, e.str()); + lg->IssueMessage(MessageType::FATAL_ERROR, e.str()); return; } @@ -204,7 +204,7 @@ std::string cmGeneratorExpressionEvaluationFile::FixRelativePath( "undefined behavior will be used." ; /* clang-format on */ - lg->IssueMessage(cmake::AUTHOR_WARNING, w.str()); + lg->IssueMessage(MessageType::AUTHOR_WARNING, w.str()); } CM_FALLTHROUGH; case cmPolicies::OLD: |