[Cmake-commits] [cmake-commits] king committed cmInstallFilesCommand.cxx 1.30 1.31 cmInstallProgramsCommand.cxx 1.23 1.24 cmLocalGenerator.cxx 1.289 1.290

[cmake-commits at cmake.org]

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

Modified Files:
	cmInstallFilesCommand.cxx cmInstallProgramsCommand.cxx 
	cmLocalGenerator.cxx 
Log Message:
BUG: Fix old-style install to prefix top

The old install_files, install_programs, and install_targets commands
used to permit installation to the top of the prefix by specifying
destination '/'.  This was broken in 2.6.0 to 2.6.2 by changes to
enforce valid destinations that did not account for this case.  This
change fixes the case by converting the install destination to '.' which
is the new-style way to specify the top of the installation prefix.


Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.289
retrieving revision 1.290
diff -C 2 -d -r1.289 -r1.290
*** cmLocalGenerator.cxx	27 Jan 2009 15:30:55 -0000	1.289
--- cmLocalGenerator.cxx	4 Feb 2009 15:34:10 -0000	1.290
***************
*** 2378,2381 ****
--- 2378,2385 ----
        std::string destination = l->second.GetInstallPath().substr(1);
        cmSystemTools::ConvertToUnixSlashes(destination);
+       if(destination.empty())
+         {
+         destination = ".";
+         }
  
        // Generate the proper install generator for this target type.

Index: cmInstallProgramsCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallProgramsCommand.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -C 2 -d -r1.23 -r1.24
*** cmInstallProgramsCommand.cxx	8 Jul 2008 15:52:25 -0000	1.23
--- cmInstallProgramsCommand.cxx	4 Feb 2009 15:34:08 -0000	1.24
***************
*** 87,90 ****
--- 87,94 ----
    std::string destination = this->Destination.substr(1);
    cmSystemTools::ConvertToUnixSlashes(destination);
+   if(destination.empty())
+     {
+     destination = ".";
+     }
  
    // Use a file install generator.

Index: cmInstallFilesCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallFilesCommand.cxx,v
retrieving revision 1.30
retrieving revision 1.31
diff -C 2 -d -r1.30 -r1.31
*** cmInstallFilesCommand.cxx	8 Jul 2008 15:52:25 -0000	1.30
--- cmInstallFilesCommand.cxx	4 Feb 2009 15:34:08 -0000	1.31
***************
*** 126,129 ****
--- 126,133 ----
    std::string destination = this->Destination.substr(1);
    cmSystemTools::ConvertToUnixSlashes(destination);
+   if(destination.empty())
+     {
+     destination = ".";
+     }
  
    // Use a file install generator.