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/cmWhileCommand.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/cmWhileCommand.cxx')
-rw-r--r-- | Source/cmWhileCommand.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmWhileCommand.cxx b/Source/cmWhileCommand.cxx index 9d43d19..a01fa6f 100644 --- a/Source/cmWhileCommand.cxx +++ b/Source/cmWhileCommand.cxx @@ -6,8 +6,8 @@ #include "cmExecutionStatus.h" #include "cmExpandedCommandArgument.h" #include "cmMakefile.h" +#include "cmMessageType.h" #include "cmSystemTools.h" -#include "cmake.h" #include <memory> // IWYU pragma: keep @@ -45,7 +45,7 @@ bool cmWhileFunctionBlocker::IsFunctionBlocked(const cmListFileFunction& lff, std::vector<cmExpandedCommandArgument> expandedArguments; mf.ExpandArguments(this->Args, expandedArguments); - cmake::MessageType messageType; + MessageType messageType; cmListFileContext execContext = this->GetStartingContext(); @@ -72,7 +72,7 @@ bool cmWhileFunctionBlocker::IsFunctionBlocked(const cmListFileFunction& lff, err += errorString; err += ")."; mf.IssueMessage(messageType, err); - if (messageType == cmake::FATAL_ERROR) { + if (messageType == MessageType::FATAL_ERROR) { cmSystemTools::SetFatalErrorOccured(); return true; } |