[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3957-g491e3c9

[Clinton Stimpson]

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  491e3c936ce1363780affa589408284ac2198c07 (commit)
       via  78cd8842966efb6d54668d47ee92bdeed35cc79e (commit)
      from  18956613a819910bd4c0ac6ed223a938bdb715f8 (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=491e3c936ce1363780affa589408284ac2198c07
commit 491e3c936ce1363780affa589408284ac2198c07
Merge: 1895661 78cd884
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Aug 21 23:29:21 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 21 23:29:21 2013 -0400

    Merge topic 'rpath-on-mac' into next
    
    78cd884 OSX: Allow an empty INSTALL_NAME_DIR to override MACOSX_RPATH.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78cd8842966efb6d54668d47ee92bdeed35cc79e
commit 78cd8842966efb6d54668d47ee92bdeed35cc79e
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Aug 21 21:09:32 2013 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Wed Aug 21 21:09:51 2013 -0600

    OSX: Allow an empty INSTALL_NAME_DIR to override MACOSX_RPATH.
    
    With this, projects can enable MACOSX_RPATH by default, but still have
    a way to install libraries with no install name dirs into locations
    such as /usr/local/lib by setting INSTALL_NAME_DIR="".

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index b9dc423..dd1bdde 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1615,7 +1615,7 @@ void cmTarget::SetMakefile(cmMakefile* mf)
   this->IsApple = this->Makefile->IsOn("APPLE");
 
   // Setup default property values.
-  this->SetPropertyDefault("INSTALL_NAME_DIR", "");
+  this->SetPropertyDefault("INSTALL_NAME_DIR", 0);
   this->SetPropertyDefault("INSTALL_RPATH", "");
   this->SetPropertyDefault("INSTALL_RPATH_USE_LINK_PATH", "OFF");
   this->SetPropertyDefault("SKIP_BUILD_RPATH", "OFF");
@@ -4541,6 +4541,10 @@ bool cmTarget::HasMacOSXRpath(const char* config)
       {
       install_name_is_rpath = true;
       }
+    else if(install_name && use_install_name)
+      {
+      return false;
+      }
     }
   else
     {
@@ -5273,18 +5277,18 @@ std::string cmTarget::GetInstallNameDirForInstallTree()
   if(this->Makefile->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME"))
     {
     std::string dir;
+    const char* install_name_dir = this->GetProperty("INSTALL_NAME_DIR");
 
     if(!this->Makefile->IsOn("CMAKE_SKIP_RPATH") &&
        !this->Makefile->IsOn("CMAKE_SKIP_INSTALL_RPATH"))
       {
-      const char* install_name_dir = this->GetProperty("INSTALL_NAME_DIR");
       if(install_name_dir && *install_name_dir)
         {
         dir = install_name_dir;
         dir += "/";
         }
       }
-    if(dir.empty() && this->GetPropertyAsBool("MACOSX_RPATH"))
+    if(!install_name_dir && this->GetPropertyAsBool("MACOSX_RPATH"))
       {
       dir = "@rpath/";
       }

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

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


hooks/post-receive
-- 
CMake