diff options
| author | Brad King <brad.king@kitware.com> | 2015-11-19 13:51:46 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-11-19 13:53:55 (GMT) |
| commit | 4ba760260b95a1d23b09130df6ec3e7736af7493 (patch) | |
| tree | a4b2b8416d3c3e098d86119f612468fd9e861550 /Source/cmGeneratorTarget.cxx | |
| parent | 4e333e3b32ba2b19b5fb07b9764264add34984b7 (diff) | |
| download | CMake-4ba760260b95a1d23b09130df6ec3e7736af7493.zip CMake-4ba760260b95a1d23b09130df6ec3e7736af7493.tar.gz CMake-4ba760260b95a1d23b09130df6ec3e7736af7493.tar.bz2 | |
Android: Restore generation of non-versioned soname (#15851)
Our check of CMAKE_PLATFORM_NO_VERSIONED_SONAME, originally added by
commit v3.1.0-rc1~416^2 (Add basic Android platform module, 2014-06-06),
was dropped accidentally by commit v3.4.0-rc1~250^2~21
(cmGeneratorTarget: Move GetLibraryNames from cmTarget, 2015-08-04).
Restore the check in the new location of the GetLibraryNames method.
Diffstat (limited to 'Source/cmGeneratorTarget.cxx')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 40afc0e..cc424b4 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -3324,6 +3324,7 @@ void cmGeneratorTarget::GetLibraryNames(std::string& name, const char* version = this->GetProperty("VERSION"); const char* soversion = this->GetProperty("SOVERSION"); if(!this->HasSOName(config) || + this->Makefile->IsOn("CMAKE_PLATFORM_NO_VERSIONED_SONAME") || this->IsFrameworkOnApple()) { // Versioning is supported only for shared libraries and modules, |