This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via ced9d8ada2bc6bb3944cac9d4814a75bbce8aa62 (commit) via cdff176f7ee487d306af138fd3e1ede340d406df (commit) via 4ba760260b95a1d23b09130df6ec3e7736af7493 (commit) via 3aec561aa20847f1e968448f96723d228e520251 (commit) via 4e333e3b32ba2b19b5fb07b9764264add34984b7 (commit) from f639bae9e50a9317798a2a583b08dddc24f85f4e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ced9d8ada2bc6bb3944cac9d4814a75bbce8aa62 commit ced9d8ada2bc6bb3944cac9d4814a75bbce8aa62 Merge: f639bae cdff176 Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Nov 19 08:55:18 2015 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Nov 19 08:55:18 2015 -0500 Merge topic 'restore-android-no-versioned-soname' into next 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) 4e333e3b CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cdff176f7ee487d306af138fd3e1ede340d406df commit cdff176f7ee487d306af138fd3e1ede340d406df Merge: 4ba7602 3aec561 Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Nov 19 08:54:54 2015 -0500 Commit: Brad King <brad.k...@kitware.com> CommitDate: Thu Nov 19 08:54:54 2015 -0500 Merge branch 'backport-android-no-versioned-soname' into restore-android-no-versioned-soname https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ba760260b95a1d23b09130df6ec3e7736af7493 commit 4ba760260b95a1d23b09130df6ec3e7736af7493 Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Nov 19 08:51:46 2015 -0500 Commit: Brad King <brad.k...@kitware.com> CommitDate: Thu Nov 19 08:53:55 2015 -0500 Android: Restore generation of non-versioned soname (#15851) 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. 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, https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3aec561aa20847f1e968448f96723d228e520251 commit 3aec561aa20847f1e968448f96723d228e520251 Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Nov 19 08:51:46 2015 -0500 Commit: Brad King <brad.k...@kitware.com> CommitDate: Thu Nov 19 08:52:40 2015 -0500 Android: Restore generation of non-versioned soname (#15851) 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. 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, ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- Source/cmGeneratorTarget.cxx | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits