kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Android: Restore generation of non-versioned soname (#15851)

Browse Source 
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.
This commit is contained in:
Brad King 2015-11-19 08:51:46 -05:00
parent 4e333e3b32
commit 4ba760260b
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/cmGeneratorTarget.cxx
View File

@ -3324,6 +3324,7 @@ void cmGeneratorTarget::GetLibraryNames(std::string& name,
const char* version = this->GetProperty("VERSION"); const char* version = this->GetProperty("VERSION");
const char* soversion = this->GetProperty("SOVERSION"); const char* soversion = this->GetProperty("SOVERSION");
if(!this->HasSOName(config) || if(!this->HasSOName(config) ||
this->Makefile->IsOn("CMAKE_PLATFORM_NO_VERSIONED_SONAME") ||
this->IsFrameworkOnApple()) this->IsFrameworkOnApple())
{ {
// Versioning is supported only for shared libraries and modules, // Versioning is supported only for shared libraries and modules,