diff options
| author | Brad King <brad.king@kitware.com> | 2015-11-20 13:53:08 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-11-20 13:53:08 (GMT) |
| commit | 67248baaf98c3c8555dfa85f532c6a840eab10b6 (patch) | |
| tree | 731e80ac69fda4948f66d803e33670ffc81a34c7 /Source | |
| parent | 1ccb417d61e08b69606a9d66b8ae4244f0b051d5 (diff) | |
| parent | cdff176f7ee487d306af138fd3e1ede340d406df (diff) | |
| download | CMake-67248baaf98c3c8555dfa85f532c6a840eab10b6.zip CMake-67248baaf98c3c8555dfa85f532c6a840eab10b6.tar.gz CMake-67248baaf98c3c8555dfa85f532c6a840eab10b6.tar.bz2 | |
Merge topic 'restore-android-no-versioned-soname'
cdff176f Merge branch 'backport-android-no-versioned-soname' into restore-android-no-versioned-soname
4ba76026 Android: Restore generation of non-versioned soname (#15851)
3aec561a Android: Restore generation of non-versioned soname (#15851)
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 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, |