[Cmake-commits] [cmake-commits] hoffman committed cmInstallCommand.cxx 1.45.2.1 1.45.2.2 cmListCommand.cxx 1.18.2.2 1.18.2.3

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv4778/Source

Modified Files:
      Tag: CMake-2-6
	cmInstallCommand.cxx cmListCommand.cxx 
Log Message:
ENH: merge in some fixes from head


Index: cmInstallCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallCommand.cxx,v
retrieving revision 1.45.2.1
retrieving revision 1.45.2.2
diff -C 2 -d -r1.45.2.1 -r1.45.2.2
*** cmInstallCommand.cxx	21 Apr 2008 00:44:51 -0000	1.45.2.1
--- cmInstallCommand.cxx	23 Apr 2008 16:14:33 -0000	1.45.2.2
***************
*** 537,541 ****
                                                             false);
              }
!           if(!runtimeArgs.GetDestination().empty())
              {
              bool failure = false;
--- 537,541 ----
                                                             false);
              }
!           else if(!runtimeArgs.GetDestination().empty())
              {
              bool failure = false;

Index: cmListCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmListCommand.cxx,v
retrieving revision 1.18.2.2
retrieving revision 1.18.2.3
diff -C 2 -d -r1.18.2.2 -r1.18.2.3
*** cmListCommand.cxx	23 Apr 2008 02:05:39 -0000	1.18.2.2
--- cmListCommand.cxx	23 Apr 2008 16:14:33 -0000	1.18.2.3
***************
*** 104,107 ****
--- 104,112 ----
      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);