1 files changed, 23 insertions, 6 deletions

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 13cd006..8ccd19c 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -924,7 +924,10 @@ void cmTarget::DefineProperties(cmake *cm)
      "The first configuration in the list found to be provided by the "
      "imported target is selected.  If this property is set and no matching "
      "configurations are available, then the imported target is considered "
-     "to be not found.  This property is ignored for non-imported targets.",
+     "to be not found.  This property is ignored for non-imported targets.\n"
+     "This property is initialized by the value of the variable "
+     "CMAKE_MAP_IMPORTED_CONFIG_<CONFIG> if it is set when a target is "
+     "created.",
      false /* TODO: make this chained */ );
 
   cm->DefineProperty
@@ -1617,7 +1620,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");
@@ -1649,6 +1652,7 @@ void cmTarget::SetMakefile(cmMakefile* mf)
     "LIBRARY_OUTPUT_DIRECTORY_",
     "RUNTIME_OUTPUT_DIRECTORY_",
     "PDB_OUTPUT_DIRECTORY_",
+    "MAP_IMPORTED_CONFIG_",
     0};
   for(std::vector<std::string>::iterator ci = configNames.begin();
       ci != configNames.end(); ++ci)
@@ -3303,7 +3307,10 @@ static void processIncludeDirectories(cmTarget *tgt,
         if (!noMessage)
           {
           tgt->GetMakefile()->IssueMessage(messageType, e.str().c_str());
-          return;
+          if (messageType == cmake::FATAL_ERROR)
+            {
+            return;
+            }
           }
         }
 
@@ -4567,6 +4574,10 @@ bool cmTarget::HasMacOSXRpath(const char* config)
       {
       install_name_is_rpath = true;
       }
+    else if(install_name && use_install_name)
+      {
+      return false;
+      }
     }
   else
     {
@@ -5299,18 +5310,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/";
       }
@@ -6436,7 +6447,13 @@ bool cmTarget::ComputeLinkInterface(const char* config, LinkInterface& iface,
                 ->GetPolicyWarning(cmPolicies::CMP0022)) << "\n"
             << "Target \"" << this->GetName() << "\" has a "
               "INTERFACE_LINK_LIBRARIES property which differs from its "
-            << linkIfaceProp << " properties.";
+            << linkIfaceProp << " properties."
+              "\n"
+              "INTERFACE_LINK_LIBRARIES:\n  "
+            << newExplicitLibraries
+            << "\n"
+            << linkIfaceProp << ":\n  "
+            << (explicitLibraries ? explicitLibraries : "(empty)") << "\n";
           this->Makefile->IssueMessage(cmake::AUTHOR_WARNING, w.str());
           }
           // Fall through