diff options
author | Brad King <brad.king@kitware.com> | 2015-08-21 13:29:06 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-08-21 13:29:06 (GMT) |
commit | badde9c2a11afd8f9127f757e964d0d94c777aad (patch) | |
tree | 2157c8e43f6730a29588807214c02a4929723dea /Source | |
parent | def5795bac507ca15f40f46ba3024e81fdcc150b (diff) | |
parent | f799ffb5cb895855ac2aba54765622b81db5be38 (diff) | |
download | CMake-badde9c2a11afd8f9127f757e964d0d94c777aad.zip CMake-badde9c2a11afd8f9127f757e964d0d94c777aad.tar.gz CMake-badde9c2a11afd8f9127f757e964d0d94c777aad.tar.bz2 |
Merge topic 'modules-no-soname'
f799ffb5 Do not set SONAME for MODULE library targets (#15705)
899458ab Tests: Cover NO_SONAME property for SHARED libraries
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmGeneratorTarget.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 530acfe..1a7b843 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -784,8 +784,7 @@ bool cmGeneratorTarget::HasSOName(const std::string& config) const { // soname is supported only for shared libraries and modules, // and then only when the platform supports an soname flag. - return ((this->GetType() == cmTarget::SHARED_LIBRARY || - this->GetType() == cmTarget::MODULE_LIBRARY) && + return ((this->GetType() == cmTarget::SHARED_LIBRARY) && !this->GetPropertyAsBool("NO_SONAME") && this->Makefile->GetSONameFlag(this->GetLinkerLanguage(config))); } |