From 611220f77af9e2c5e174aa7ff9fa8bba982374ef Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 25 Jul 2015 22:51:53 +0200 Subject: cmTarget: Use reliable test for CMP0024 and CMP0026 OLD. Check whether the Makefile is fully configured instead of checking whether generator targets exist. --- Source/cmTarget.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 3d8adae..da57c4c 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -723,7 +723,7 @@ void cmTarget::GetSourceFiles(std::vector &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& languages, std::vector objectLibraries; std::vector externalObjects; - if (this->Makefile->GetGeneratorTargets().empty()) + if (!this->Makefile->IsConfigured()) { this->GetObjectLibrariesCMP0026(objectLibraries); } -- cgit v0.12