Browse Source

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

Brad King 10 years ago
parent
commit
59b6d8a81b
1 changed files with 1 additions and 0 deletions
  1. 1 0
      Source/cmGeneratorTarget.cxx

+ 1 - 0
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,