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:52:40 (GMT) |
| commit | 3aec561aa20847f1e968448f96723d228e520251 (patch) | |
| tree | fff21f387b840d90d404bf30d63031c8c5703d0e /Source | |
| parent | b4a2ada297214119647b26df8abe394cd73ca53a (diff) | |
| download | CMake-3aec561aa20847f1e968448f96723d228e520251.zip CMake-3aec561aa20847f1e968448f96723d228e520251.tar.gz CMake-3aec561aa20847f1e968448f96723d228e520251.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')
| -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 62598f4..194cd88 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -2747,6 +2747,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->Target->IsFrameworkOnApple()) { // Versioning is supported only for shared libraries and modules, |