Merge topic 'no-assert-missing-objlib'

d648c476 cmTarget: Don't assert on object libraries for configure-time location.
This commit is contained in:
Brad King
2014-05-07 09:18:35 -04:00
committed by CMake Topic Stage
5 changed files with 31 additions and 2 deletions
+4 -2
View File
@@ -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);
}
}
}
}