This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 61e69451ace821aaa94a9ba2b2f4e15140222736 (commit)
via f4458e9fd0120198fab3b862f1e12552fd9d9c4b (commit)
from da3c79a376774a27792e349381ea727bc91e1eef (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61e69451ace821aaa94a9ba2b2f4e15140222736
commit 61e69451ace821aaa94a9ba2b2f4e15140222736
Merge: da3c79a f4458e9
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Fri Oct 7 16:05:06 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Oct 7 16:05:06 2016 -0400
Merge topic 'clean-up-link-configuration' into next
f4458e9f cmMakefile: Simplify programmer error to an assert
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4458e9fd0120198fab3b862f1e12552fd9d9c4b
commit f4458e9fd0120198fab3b862f1e12552fd9d9c4b
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Fri Oct 7 20:13:37 2016 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Fri Oct 7 22:04:54 2016 +0200
cmMakefile: Simplify programmer error to an assert
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 2414b32..d443423 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1836,14 +1836,9 @@ cmTarget* cmMakefile::AddLibrary(const std::string&
lname,
const std::vector<std::string>& srcs,
bool excludeFromAll)
{
- // wrong type ? default to STATIC
- if ((type != cmState::STATIC_LIBRARY) && (type != cmState::SHARED_LIBRARY) &&
- (type != cmState::MODULE_LIBRARY) && (type != cmState::OBJECT_LIBRARY) &&
- (type != cmState::INTERFACE_LIBRARY)) {
- this->IssueMessage(cmake::INTERNAL_ERROR,
- "cmMakefile::AddLibrary given invalid target type.");
- type = cmState::STATIC_LIBRARY;
- }
+ assert(type == cmState::STATIC_LIBRARY || type == cmState::SHARED_LIBRARY ||
+ type == cmState::MODULE_LIBRARY || type == cmState::OBJECT_LIBRARY ||
+ type == cmState::INTERFACE_LIBRARY);
cmTarget* target = this->AddNewTarget(type, lname);
// Clear its dependencies. Otherwise, dependencies might persist
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
