[Cmake-commits] CMake branch, next, updated. v2.8.8-2671-gb9fe606

[Brad King]

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  b9fe606aff25f7940082e60bedb0b1cd28176aaa (commit)
       via  6ad39679856a5fc9a90c24923af8e48901923cb6 (commit)
      from  36ae3659c2d2cf4f7917f0ab9d5eaa5a455c0b55 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b9fe606aff25f7940082e60bedb0b1cd28176aaa
commit b9fe606aff25f7940082e60bedb0b1cd28176aaa
Merge: 36ae365 6ad3967
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 23 11:37:55 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 23 11:37:55 2012 -0400

    Merge topic 'module-no-soname' into next
    
    6ad3967 OS X: Fix Framework install-name after NO_SONAME change


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ad39679856a5fc9a90c24923af8e48901923cb6
commit 6ad39679856a5fc9a90c24923af8e48901923cb6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 23 11:20:12 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 23 11:30:13 2012 -0400

    OS X: Fix Framework install-name after NO_SONAME change
    
    Commit 2d951c1d (Support building shared libraries or modules without
    soname, 2012-04-22) factored test logic out of cmTarget::GetSOName to
    create cmTarget::HasSOName, but it took slightly too much of the test.
    OS X frameworks do have an install-name (OS X equivalent to soname) but
    do not have versioned file names.  Move that piece of the test logic
    back to its original location.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 05ded57..c96ca94 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -3025,8 +3025,7 @@ bool cmTarget::HasSOName(const char* config)
   return ((this->GetType() == cmTarget::SHARED_LIBRARY ||
            this->GetType() == cmTarget::MODULE_LIBRARY) &&
           !this->GetPropertyAsBool("NO_SONAME") &&
-          this->Makefile->GetDefinition(sonameFlag.c_str()) &&
-          !this->IsFrameworkOnApple());
+          this->Makefile->GetDefinition(sonameFlag.c_str()));
 }
 
 //----------------------------------------------------------------------------
@@ -3365,7 +3364,8 @@ void cmTarget::GetLibraryNames(std::string& name,
   // Check for library version properties.
   const char* version = this->GetProperty("VERSION");
   const char* soversion = this->GetProperty("SOVERSION");
-  if(!this->HasSOName(config))
+  if(!this->HasSOName(config) ||
+     this->IsFrameworkOnApple())
     {
     // Versioning is supported only for shared libraries and modules,
     // and then only when the platform supports an soname flag.

-----------------------------------------------------------------------

Summary of changes:
 Source/cmTarget.cxx |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake