diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-13 17:38:28 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-10-13 17:38:28 (GMT) |
| commit | 2d6fba67804ffcdeb1ca95198aacb326dd8fc4e7 (patch) | |
| tree | 04c7319272faedd0f41316c41ea5b83535eda0ed /Source/cmMakefileLibraryTargetGenerator.cxx | |
| parent | f6386a768e98b77a0128ac2aac4d07e241b17da4 (diff) | |
| parent | 933e54d3ccf59fd756997752a041ee84e5f85897 (diff) | |
| download | CMake-2d6fba67804ffcdeb1ca95198aacb326dd8fc4e7.zip CMake-2d6fba67804ffcdeb1ca95198aacb326dd8fc4e7.tar.gz CMake-2d6fba67804ffcdeb1ca95198aacb326dd8fc4e7.tar.bz2 | |
Merge branch 'backport-LINK_WHAT_YOU_USE-allow-OFF' into release
Diffstat (limited to 'Source/cmMakefileLibraryTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileLibraryTargetGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index b969bfb..2b1d7cc 100644 --- a/Source/cmMakefileLibraryTargetGenerator.cxx +++ b/Source/cmMakefileLibraryTargetGenerator.cxx @@ -161,7 +161,7 @@ void cmMakefileLibraryTargetGenerator::WriteSharedLibraryRules(bool relink) extraFlags, "CMAKE_SHARED_LINKER_FLAGS", this->ConfigName); this->AddModuleDefinitionFlag(extraFlags); - if (this->GeneratorTarget->GetProperty("LINK_WHAT_YOU_USE")) { + if (this->GeneratorTarget->GetPropertyAsBool("LINK_WHAT_YOU_USE")) { this->LocalGenerator->AppendFlags(extraFlags, " -Wl,--no-as-needed"); } this->WriteLibraryRules(linkRuleVar, extraFlags, relink); @@ -638,7 +638,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules( // Get the set of commands. std::string linkRule = this->GetLinkRule(linkRuleVar); cmSystemTools::ExpandListArgument(linkRule, real_link_commands); - if (this->GeneratorTarget->GetProperty("LINK_WHAT_YOU_USE") && + if (this->GeneratorTarget->GetPropertyAsBool("LINK_WHAT_YOU_USE") && (this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY)) { std::string cmakeCommand = this->LocalGenerator->ConvertToOutputFormat( cmSystemTools::GetCMakeCommand(), cmLocalGenerator::SHELL); |