mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-05 22:28:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmMakefile: Simplify programmer error to an assert

Browse Source
This commit is contained in:
Stephen Kelly
2016-10-07 20:13:37 +02:00
parent 4079ba20d9
commit a1cfc4fe3d
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmMakefile.cxx
View File

@@ -1832,14 +1832,9 @@ cmTarget* cmMakefile::AddLibrary(const std::string& lname,
const std::vector<std::string>& srcs, const std::vector<std::string>& srcs,
bool excludeFromAll) bool excludeFromAll)
{ {
// wrong type ? default to STATIC assert(type == cmState::STATIC_LIBRARY || type == cmState::SHARED_LIBRARY ||
if ((type != cmState::STATIC_LIBRARY) && (type != cmState::SHARED_LIBRARY) && type == cmState::MODULE_LIBRARY || type == cmState::OBJECT_LIBRARY ||
(type != cmState::MODULE_LIBRARY) && (type != cmState::OBJECT_LIBRARY) && type == cmState::INTERFACE_LIBRARY);
(type != cmState::INTERFACE_LIBRARY)) {
this->IssueMessage(cmake::INTERNAL_ERROR,
"cmMakefile::AddLibrary given invalid target type.");
type = cmState::STATIC_LIBRARY;
}
cmTarget* target = this->AddNewTarget(type, lname); cmTarget* target = this->AddNewTarget(type, lname);
// Clear its dependencies. Otherwise, dependencies might persist // Clear its dependencies. Otherwise, dependencies might persist