Merge branch 'backport-android-no-versioned-soname' into release

This commit is contained in:
Brad King 2015-11-19 08:57:27 -05:00
commit 59b6d8a81b

View File

@ -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,