diff options
| author | Michael Stürmer <michael.stuermer@schaeffler.com> | 2018-04-04 06:03:29 (GMT) |
|---|---|---|
| committer | Michael Stürmer <michael.stuermer@schaeffler.com> | 2018-04-05 04:36:49 (GMT) |
| commit | fb433ff283e57fc953975e7a7cfb9f24dcbf789b (patch) | |
| tree | 84d2a68af7946a000c1bba0cc60078474ba57a7f /Source/cmGeneratorTarget.cxx | |
| parent | 4c1f33961f784c47bcd93f4a5875c1c8f60873b7 (diff) | |
| download | CMake-fb433ff283e57fc953975e7a7cfb9f24dcbf789b.zip CMake-fb433ff283e57fc953975e7a7cfb9f24dcbf789b.tar.gz CMake-fb433ff283e57fc953975e7a7cfb9f24dcbf789b.tar.bz2 | |
cmGeneratorTarget: Make import library checks config-aware
Diffstat (limited to 'Source/cmGeneratorTarget.cxx')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 57bdff7..2c78db9 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -5403,16 +5403,17 @@ std::string cmGeneratorTarget::GetPDBDirectory(const std::string& config) const return ""; } -bool cmGeneratorTarget::HasImplibGNUtoMS() const +bool cmGeneratorTarget::HasImplibGNUtoMS(std::string const& config) const { - return this->HasImportLibrary() && this->GetPropertyAsBool("GNUtoMS"); + return this->HasImportLibrary(config) && this->GetPropertyAsBool("GNUtoMS"); } -bool cmGeneratorTarget::GetImplibGNUtoMS(std::string const& gnuName, +bool cmGeneratorTarget::GetImplibGNUtoMS(std::string const& config, + std::string const& gnuName, std::string& out, const char* newExt) const { - if (this->HasImplibGNUtoMS() && gnuName.size() > 6 && + if (this->HasImplibGNUtoMS(config) && gnuName.size() > 6 && gnuName.substr(gnuName.size() - 6) == ".dll.a") { out = gnuName.substr(0, gnuName.size() - 6); out += newExt ? newExt : ".lib"; @@ -5427,7 +5428,7 @@ bool cmGeneratorTarget::IsExecutableWithExports() const this->GetPropertyAsBool("ENABLE_EXPORTS")); } -bool cmGeneratorTarget::HasImportLibrary() const +bool cmGeneratorTarget::HasImportLibrary(std::string const& config) const { return (this->IsDLLPlatform() && (this->GetType() == cmStateEnums::SHARED_LIBRARY || |