diff options
author | Marc Chevrier <marc.chevrier@gmail.com> | 2018-08-15 13:20:18 (GMT) |
---|---|---|
committer | Marc Chevrier <marc.chevrier@gmail.com> | 2018-08-15 13:20:18 (GMT) |
commit | 974de0e19932d27576a5c7661905f75b2b8daaa9 (patch) | |
tree | 4d66d41907b6425c789e8b4fce64e52290817e0e /Source/cmLocalGenerator.cxx | |
parent | 349f8bfb25349892fb2c4e5a9942e4bd63f86f49 (diff) | |
download | CMake-974de0e19932d27576a5c7661905f75b2b8daaa9.zip CMake-974de0e19932d27576a5c7661905f75b2b8daaa9.tar.gz CMake-974de0e19932d27576a5c7661905f75b2b8daaa9.tar.bz2 |
static library: add property STATIC_LIBRARY_OPTIONS
issue: #18251
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
-rw-r--r-- | Source/cmLocalGenerator.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 5e6ce1a..75b7f23 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -979,6 +979,7 @@ void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs, void cmLocalGenerator::GetStaticLibraryFlags(std::string& flags, std::string const& config, + std::string const& linkLanguage, cmGeneratorTarget* target) { this->AppendFlags( @@ -992,6 +993,11 @@ void cmLocalGenerator::GetStaticLibraryFlags(std::string& flags, std::string name = "STATIC_LIBRARY_FLAGS_" + config; this->AppendFlags(flags, target->GetProperty(name)); } + + std::vector<std::string> options; + target->GetStaticLibraryLinkOptions(options, config, linkLanguage); + // STATIC_LIBRARY_OPTIONS are escaped. + this->AppendCompileOptions(flags, options); } void cmLocalGenerator::GetTargetFlags( @@ -1009,7 +1015,7 @@ void cmLocalGenerator::GetTargetFlags( switch (target->GetType()) { case cmStateEnums::STATIC_LIBRARY: - this->GetStaticLibraryFlags(linkFlags, buildType, target); + this->GetStaticLibraryFlags(linkFlags, buildType, linkLanguage, target); break; case cmStateEnums::MODULE_LIBRARY: libraryLinkVariable = "CMAKE_MODULE_LINKER_FLAGS"; |