ENH: merge in some fixes from head

5 files changed, 42 insertions, 5 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef30773766..3c42db05e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -354,7 +354,7 @@ ENDMACRO (CMAKE_BUILD_UTILITIES)
 SET(CMake_VERSION_MAJOR 2)
 SET(CMake_VERSION_MINOR 6)
 SET(CMake_VERSION_PATCH 0)
-SET(CMake_VERSION_RC 84)
+SET(CMake_VERSION_RC 85)
 # CVS versions are odd, if this is an odd minor version
 # then set the CMake_VERSION_DATE variable
 IF("${CMake_VERSION_MINOR}" MATCHES "[13579]$")
diff --git a/ChangeLog.manual b/ChangeLog.manual
index 1a573fb1f7..972ef71179 100644
--- a/ChangeLog.manual
+++ b/ChangeLog.manual
@@ -1,3 +1,9 @@
+Changes in CMake 2.6.0 RC 85
+
+- Fix bug in install command with BUNDLE DESTINATION
+- Make mac install symlinks check for errors
+- Fix for CMP0007, to not warn about empty lists
+
 Changes in CMake 2.6.0 RC 84
 
 - Preserve static libraries when linked multiple times 
diff --git a/Source/QtDialog/QMacInstallDialog.cxx b/Source/QtDialog/QMacInstallDialog.cxx
index 70293f82b3..fbeb10efb5 100644
--- a/Source/QtDialog/QMacInstallDialog.cxx
+++ b/Source/QtDialog/QMacInstallDialog.cxx
@@ -69,12 +69,38 @@ void QMacInstallDialog::DoInstall()
     if(cmSystemTools::FileExists(newName.c_str()))
       {
       std::cout << "rm [" << newName << "]\n";
-      cmSystemTools::RemoveFile(newName.c_str());
+      if(!cmSystemTools::RemoveFile(newName.c_str()))
+        {
+        QString message = tr("Failed to remove file "
+                             "installation may be incomplete: ");
+        message += newName.c_str();
+        QString title = tr("Error Removing file");
+        QMessageBox::StandardButton btn =
+          QMessageBox::critical(this, title, message, 
+                                QMessageBox::Ok|QMessageBox::Abort);
+        if(btn == QMessageBox::Abort)
+          {
+          return;
+          }
+        }
       }
     std::cout << "ln -s [" << file << "] [";
     std::cout << newName << "]\n";
-    cmSystemTools::CreateSymlink(file.c_str(),
-                                 newName.c_str());
+    if(!cmSystemTools::CreateSymlink(file.c_str(),
+                                     newName.c_str()))
+      {
+      QString message = tr("Failed create symlink "
+                           "installation may be incomplete: ");
+      message += newName.c_str();
+      QString title = tr("Error Creating Symlink");
+      QMessageBox::StandardButton btn =
+        QMessageBox::critical(this, title, message, 
+                              QMessageBox::Ok|QMessageBox::Abort);
+      if(btn == QMessageBox::Abort)
+        {
+        return;
+        }
+      }
     }
   this->done(0);
 }
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index 03bd15928d..6ce7ae5bb4 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -536,7 +536,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
             bundleGenerator = CreateInstallTargetGenerator(target, bundleArgs, 
                                                            false);
             }
-          if(!runtimeArgs.GetDestination().empty())
+          else if(!runtimeArgs.GetDestination().empty())
             {
             bool failure = false;
             if(this->CheckCMP0006(failure))
diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index 9d71860dd6..efda0e5a5d 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -103,6 +103,11 @@ bool cmListCommand::GetList(std::vector<std::string>& list, const char* var)
     {
     return false;
     }
+  // if the size of the list 
+  if(listString.size() == 0)
+    {
+    return true;
+    }
   // expand the variable into a list
   cmSystemTools::ExpandListArgument(listString, list, true);
   // check the list for empty values