summaryrefslogtreecommitdiffstats
path: root/Source/cmComputeTargetDepends.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-01-16 14:47:00 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-01-16 14:47:14 (GMT)
commit68a30b50a5894d0425122ae4bbfd40b0492ff116 (patch)
tree682f3fc0372fa0a287ca027f07eda2930e643a8e /Source/cmComputeTargetDepends.cxx
parent7721b70e231c94188a8f5643fddad661fe6f1eb1 (diff)
parentcc2a5261f82c21e15899bba0d9b508fcacda7879 (diff)
downloadCMake-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/cmComputeTargetDepends.cxx')
-rw-r--r--Source/cmComputeTargetDepends.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index f8ac333..fde9750 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -9,6 +9,7 @@
#include "cmListFileCache.h"
#include "cmLocalGenerator.h"
#include "cmMakefile.h"
+#include "cmMessageType.h"
#include "cmPolicies.h"
#include "cmSourceFile.h"
#include "cmState.h"
@@ -217,7 +218,7 @@ void cmComputeTargetDepends::CollectTargetDepends(int depender_index)
depender->GetType() != cmStateEnums::MODULE_LIBRARY &&
depender->GetType() != cmStateEnums::OBJECT_LIBRARY) {
this->GlobalGenerator->GetCMakeInstance()->IssueMessage(
- cmake::FATAL_ERROR,
+ MessageType::FATAL_ERROR,
"Only executables and libraries may reference target objects.",
depender->GetBacktrace());
return;
@@ -314,7 +315,7 @@ void cmComputeTargetDepends::AddTargetDepend(int depender_index,
if (!dependee && !linking &&
(depender->GetType() != cmStateEnums::GLOBAL_TARGET)) {
- cmake::MessageType messageType = cmake::AUTHOR_WARNING;
+ MessageType messageType = MessageType::AUTHOR_WARNING;
bool issueMessage = false;
std::ostringstream e;
switch (depender->GetPolicyStatusCMP0046()) {
@@ -327,7 +328,7 @@ void cmComputeTargetDepends::AddTargetDepend(int depender_index,
case cmPolicies::REQUIRED_IF_USED:
case cmPolicies::REQUIRED_ALWAYS:
issueMessage = true;
- messageType = cmake::FATAL_ERROR;
+ messageType = MessageType::FATAL_ERROR;
}
if (issueMessage) {
cmake* cm = this->GlobalGenerator->GetCMakeInstance();