diff options
| author | Brad King <brad.king@kitware.com> | 2015-07-08 17:27:29 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-07-08 17:27:29 (GMT) |
| commit | d805767545bd4829db4fa1bd2724042f895a2cd9 (patch) | |
| tree | 5ac956752674d4b912c3f7e505ec26d39a763087 /Source/cmTarget.cxx | |
| parent | e7c33efa1520401cdc1f71b4c37cf1ffa6da3f78 (diff) | |
| parent | 7aa9e80e35f62ec5686d08b49ebe8b57cbc6cbc6 (diff) | |
| download | CMake-d805767545bd4829db4fa1bd2724042f895a2cd9.zip CMake-d805767545bd4829db4fa1bd2724042f895a2cd9.tar.gz CMake-d805767545bd4829db4fa1bd2724042f895a2cd9.tar.bz2 | |
Merge branch 'empty-LINK_LIBRARIES' into release
Diffstat (limited to 'Source/cmTarget.cxx')
| -rw-r--r-- | Source/cmTarget.cxx | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 4def889..20d3208 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -1748,9 +1748,12 @@ void cmTarget::SetProperty(const std::string& prop, const char* value) else if (prop == "LINK_LIBRARIES") { this->Internal->LinkImplementationPropertyEntries.clear(); - cmListFileBacktrace lfbt = this->Makefile->GetBacktrace(); - cmValueWithOrigin entry(value, lfbt); - this->Internal->LinkImplementationPropertyEntries.push_back(entry); + if (value) + { + cmListFileBacktrace lfbt = this->Makefile->GetBacktrace(); + cmValueWithOrigin entry(value, lfbt); + this->Internal->LinkImplementationPropertyEntries.push_back(entry); + } } else if (prop == "SOURCES") { @@ -1834,9 +1837,12 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value, } else if (prop == "LINK_LIBRARIES") { - cmListFileBacktrace lfbt = this->Makefile->GetBacktrace(); - cmValueWithOrigin entry(value, lfbt); - this->Internal->LinkImplementationPropertyEntries.push_back(entry); + if (value) + { + cmListFileBacktrace lfbt = this->Makefile->GetBacktrace(); + cmValueWithOrigin entry(value, lfbt); + this->Internal->LinkImplementationPropertyEntries.push_back(entry); + } } else if (prop == "SOURCES") { |