diff options
| author | Brad King <brad.king@kitware.com> | 2015-11-19 13:57:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-11-19 13:57:27 (GMT) |
| commit | 59b6d8a81bc4f975664a1b04cd349235e5a152b7 (patch) | |
| tree | c2c6493deb1d0a038ea87602f1cf123f490d6cac /Source | |
| parent | ce7da2dec4939b56128f7d05d008069d44ec506b (diff) | |
| parent | 3aec561aa20847f1e968448f96723d228e520251 (diff) | |
| download | CMake-59b6d8a81bc4f975664a1b04cd349235e5a152b7.zip CMake-59b6d8a81bc4f975664a1b04cd349235e5a152b7.tar.gz CMake-59b6d8a81bc4f975664a1b04cd349235e5a152b7.tar.bz2 | |
Merge branch 'backport-android-no-versioned-soname' into release
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, |