diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-07 13:18:35 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-05-07 13:18:35 (GMT) |
| commit | 295cf31ca6c377ee04e6d384137e85fe9ff7eb1d (patch) | |
| tree | f9797c62a2e34c0fd4ce2f6a25959d02a75584fc /Source | |
| parent | 080a80457b6b08376e818a8cf6d6a0378465fbfa (diff) | |
| parent | d648c4766ff56907bc17287077eeebcc9e40b184 (diff) | |
| download | CMake-295cf31ca6c377ee04e6d384137e85fe9ff7eb1d.zip CMake-295cf31ca6c377ee04e6d384137e85fe9ff7eb1d.tar.gz CMake-295cf31ca6c377ee04e6d384137e85fe9ff7eb1d.tar.bz2 | |
Merge topic 'no-assert-missing-objlib'
d648c476 cmTarget: Don't assert on object libraries for configure-time location.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmTarget.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index ee6cb44..a27f76b 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -5564,8 +5564,10 @@ cmTarget::GetObjectLibrariesCMP0026(std::vector<cmTarget*>& objlibs) const continue; } cmTarget *objLib = this->Makefile->FindTargetToUse(objLibName.c_str()); - assert(objLib); - objlibs.push_back(objLib); + if(objLib) + { + objlibs.push_back(objLib); + } } } } |