[cmake-commits] king committed cmInstallFilesCommand.cxx 1.25 1.26 cmInstallProgramsCommand.cxx 1.18 1.19

[cmake-commits at cmake.org]

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

Modified Files:
	cmInstallFilesCommand.cxx cmInstallProgramsCommand.cxx 
Log Message:
BUG: Fixed INSTALL_FILES and INSTALL_PROGRAMS commands to install under the prefix like they did before the recent changes.


Index: cmInstallFilesCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallFilesCommand.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- cmInstallFilesCommand.cxx	23 May 2007 19:40:12 -0000	1.25
+++ cmInstallFilesCommand.cxx	25 May 2007 15:01:20 -0000	1.26
@@ -112,6 +112,12 @@
       }
     }
 
+  // Construct the destination.  This command always installs under
+  // the prefix.
+  std::string destination = "${CMAKE_INSTALL_PREFIX}";
+  destination += this->Destination;
+  cmSystemTools::ConvertToUnixSlashes(destination);
+
   // Use a file install generator.
   const char* no_permissions = "";
   const char* no_rename = "";
@@ -119,7 +125,7 @@
   std::vector<std::string> no_configurations;
   this->Makefile->AddInstallGenerator(
     new cmInstallFilesGenerator(this->Files,
-                                this->Destination.c_str(), false,
+                                destination.c_str(), false,
                                 no_permissions, no_configurations,
                                 no_component, no_rename));
 }

Index: cmInstallProgramsCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallProgramsCommand.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- cmInstallProgramsCommand.cxx	23 May 2007 19:40:12 -0000	1.18
+++ cmInstallProgramsCommand.cxx	25 May 2007 15:01:20 -0000	1.19
@@ -79,6 +79,12 @@
       }
     }
 
+  // Construct the destination.  This command always installs under
+  // the prefix.
+  std::string destination = "${CMAKE_INSTALL_PREFIX}";
+  destination += this->Destination;
+  cmSystemTools::ConvertToUnixSlashes(destination);
+
   // Use a file install generator.
   const char* no_permissions = "";
   const char* no_rename = "";
@@ -86,7 +92,7 @@
   std::vector<std::string> no_configurations;
   this->Makefile->AddInstallGenerator(
     new cmInstallFilesGenerator(this->Files,
-                                this->Destination.c_str(), true,
+                                destination.c_str(), true,
                                 no_permissions, no_configurations,
                                 no_component, no_rename));
 }