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/cmAddLibraryCommand.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/cmAddLibraryCommand.cxx')
-rw-r--r-- | Source/cmAddLibraryCommand.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx index fae8063..5149333 100644 --- a/Source/cmAddLibraryCommand.cxx +++ b/Source/cmAddLibraryCommand.cxx @@ -7,11 +7,11 @@ #include "cmGeneratorExpression.h" #include "cmGlobalGenerator.h" #include "cmMakefile.h" +#include "cmMessageType.h" #include "cmState.h" #include "cmStateTypes.h" #include "cmSystemTools.h" #include "cmTarget.h" -#include "cmake.h" class cmExecutionStatus; @@ -259,7 +259,7 @@ bool cmAddLibraryCommand::InitialPass(std::vector<std::string> const& args, << (type == cmStateEnums::SHARED_LIBRARY ? "SHARED" : "MODULE") << " option but the target platform does not support dynamic linking. " "Building a STATIC library instead. This may lead to problems."; - this->Makefile->IssueMessage(cmake::AUTHOR_WARNING, w.str()); + this->Makefile->IssueMessage(MessageType::AUTHOR_WARNING, w.str()); type = cmStateEnums::STATIC_LIBRARY; } @@ -275,7 +275,7 @@ bool cmAddLibraryCommand::InitialPass(std::vector<std::string> const& args, if (!this->Makefile->GetGlobalGenerator()->HasKnownObjectFileLocation( &reason)) { this->Makefile->IssueMessage( - cmake::FATAL_ERROR, + MessageType::FATAL_ERROR, "The OBJECT library type may not be used for IMPORTED libraries" + reason + "."); return true; @@ -307,7 +307,7 @@ bool cmAddLibraryCommand::InitialPass(std::vector<std::string> const& args, // A non-imported target may not have UNKNOWN type. if (type == cmStateEnums::UNKNOWN_LIBRARY) { this->Makefile->IssueMessage( - cmake::FATAL_ERROR, + MessageType::FATAL_ERROR, "The UNKNOWN library type may be used only for IMPORTED libraries."); return true; } |