diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-07-25 22:51:53 +0200 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-07-27 21:58:49 +0200 |
| commit | 611220f77af9e2c5e174aa7ff9fa8bba982374ef (patch) | |
| tree | 4c31733d8dcba95d3ad8cb6fc44469f139a2e7e4 /Source | |
| parent | bbad6ba53771dc77bfdf74bab7173374084d434c (diff) | |
| download | cmake-611220f77af9e2c5e174aa7ff9fa8bba982374ef.tar.gz | |
cmTarget: Use reliable test for CMP0024 and CMP0026 OLD.
Check whether the Makefile is fully configured instead of checking
whether generator targets exist.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmTarget.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 3d8adae9ed..da57c4cbe3 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -723,7 +723,7 @@ void cmTarget::GetSourceFiles(std::vector<std::string> &files, { 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 // 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<cmSourceFile const*> externalObjects; - if (this->Makefile->GetGeneratorTargets().empty()) + if (!this->Makefile->IsConfigured()) { this->GetObjectLibrariesCMP0026(objectLibraries); } |