diff options
| author | Patrick Gansterer <paroga@paroga.com> | 2013-07-10 17:11:04 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-07-31 12:41:07 (GMT) |
| commit | 14bbf8340ac4d285b61afb5b61ebc4c730f4b4fa (patch) | |
| tree | f8ee4cb65582a6135748647e7830d28e66fc30d0 /Source/cmMakefileLibraryTargetGenerator.cxx | |
| parent | 8d3b65346f112d2d21efd3105f4d1535adc2935e (diff) | |
| download | CMake-14bbf8340ac4d285b61afb5b61ebc4c730f4b4fa.zip CMake-14bbf8340ac4d285b61afb5b61ebc4c730f4b4fa.tar.gz CMake-14bbf8340ac4d285b61afb5b61ebc4c730f4b4fa.tar.bz2 | |
Unify the way the flags of a static library are read
Introduce cmLocalGenerator::GetStaticLibraryFlags() to have a central
function for getting the linker flags for a given target.
Diffstat (limited to 'Source/cmMakefileLibraryTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileLibraryTargetGenerator.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index 347f26d..ea9663f 100644 --- a/Source/cmMakefileLibraryTargetGenerator.cxx +++ b/Source/cmMakefileLibraryTargetGenerator.cxx @@ -144,12 +144,8 @@ void cmMakefileLibraryTargetGenerator::WriteStaticLibraryRules() } std::string extraFlags; - this->LocalGenerator->AppendFlags - (extraFlags,this->Target->GetProperty("STATIC_LIBRARY_FLAGS")); - std::string staticLibraryFlagsConfig = "STATIC_LIBRARY_FLAGS_"; - staticLibraryFlagsConfig += cmSystemTools::UpperCase(this->ConfigName); - this->LocalGenerator->AppendFlags - (extraFlags, this->Target->GetProperty(staticLibraryFlagsConfig.c_str())); + this->LocalGenerator->GetStaticLibraryFlags(extraFlags, + cmSystemTools::UpperCase(this->ConfigName), this->Target); this->WriteLibraryRules(linkRuleVar.c_str(), extraFlags.c_str(), false); } |