kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmTarget: Use reliable test for CMP0024 and CMP0026 OLD. 

Check whether the Makefile is fully configured instead of checking
whether generator targets exist.
This commit is contained in:
Stephen Kelly 2015-07-25 22:51:53 +02:00
parent bbad6ba537
commit 611220f77a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmTarget.cxx
View File

@ -723,7 +723,7 @@ void cmTarget::GetSourceFiles(std::vector<std::string> &files,
{ {
assert(this->GetType() != INTERFACE_LIBRARY); assert(this->GetType() != INTERFACE_LIBRARY);
if (this->Makefile->GetGeneratorTargets().empty()) if (!this->Makefile->IsConfigured())
{ {
// At configure-time, this method can be called as part of getting the // At configure-time, this method can be called as part of getting the
// LOCATION property or to export() a file to be include()d. However // LOCATION property or to export() a file to be include()d. However
@ -5249,7 +5249,7 @@ void cmTarget::GetLanguages(std::set<std::string>& languages,
std::vector<cmTarget*> objectLibraries; std::vector<cmTarget*> objectLibraries;
std::vector<cmSourceFile const*> externalObjects; std::vector<cmSourceFile const*> externalObjects;
if (this->Makefile->GetGeneratorTargets().empty()) if (!this->Makefile->IsConfigured())
{ {
this->GetObjectLibrariesCMP0026(objectLibraries); this->GetObjectLibrariesCMP0026(objectLibraries);
} }