diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-02 15:08:09 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-06-02 15:08:09 (GMT) |
| commit | 7e8cfb9549b7a3b24f72c15ee353544ec2810293 (patch) | |
| tree | 5c45eab42c5f75ee4692aecdb4fad34035818ed4 /Source | |
| parent | aa483a4053d7958bdc8043f441a566ac42d40079 (diff) | |
| parent | f500a784d008566d6eb6301b7c6a0f07847b856d (diff) | |
| download | CMake-7e8cfb9549b7a3b24f72c15ee353544ec2810293.zip CMake-7e8cfb9549b7a3b24f72c15ee353544ec2810293.tar.gz CMake-7e8cfb9549b7a3b24f72c15ee353544ec2810293.tar.bz2 | |
Merge branch 'fix-TARGET_PROPERTY-LOCATION-crash' into release
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmTarget.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 5e0d2b7..f435a1d 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -1131,7 +1131,9 @@ const char* cmTarget::GetProperty(const std::string& prop, // target because the configuration type may not be known at // CMake time. cmGlobalGenerator* gg = this->Makefile->GetGlobalGenerator(); - gg->CreateGenerationObjects(); + if (!gg->GetConfigureDoneCMP0026()) { + gg->CreateGenerationObjects(); + } cmGeneratorTarget* gt = gg->FindGeneratorTarget(this->GetName()); this->Properties.SetProperty(propLOCATION, gt->GetLocationForBuild()); } @@ -1150,7 +1152,9 @@ const char* cmTarget::GetProperty(const std::string& prop, prop, this->ImportedGetFullPath(configName, false).c_str()); } else { cmGlobalGenerator* gg = this->Makefile->GetGlobalGenerator(); - gg->CreateGenerationObjects(); + if (!gg->GetConfigureDoneCMP0026()) { + gg->CreateGenerationObjects(); + } cmGeneratorTarget* gt = gg->FindGeneratorTarget(this->GetName()); this->Properties.SetProperty( prop, gt->GetFullPath(configName, false).c_str()); @@ -1168,7 +1172,9 @@ const char* cmTarget::GetProperty(const std::string& prop, prop, this->ImportedGetFullPath(configName, false).c_str()); } else { cmGlobalGenerator* gg = this->Makefile->GetGlobalGenerator(); - gg->CreateGenerationObjects(); + if (!gg->GetConfigureDoneCMP0026()) { + gg->CreateGenerationObjects(); + } cmGeneratorTarget* gt = gg->FindGeneratorTarget(this->GetName()); this->Properties.SetProperty( prop, gt->GetFullPath(configName, false).c_str()); |