kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Fixed INSTALL_FILES and INSTALL_PROGRAMS commands to install under the prefix like they did before the recent changes.

This commit is contained in:
Brad King 2007-05-25 11:01:20 -04:00
parent 9192d1d153
commit 92ec498b8c
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmInstallFilesCommand.cxx
View File

@ -112,6 +112,12 @@ void cmInstallFilesCommand::FinalPass()
} }
} }
// 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. // Use a file install generator.
const char* no_permissions = ""; const char* no_permissions = "";
const char* no_rename = ""; const char* no_rename = "";
@ -119,7 +125,7 @@ void cmInstallFilesCommand::FinalPass()
std::vector<std::string> no_configurations; std::vector<std::string> no_configurations;
this->Makefile->AddInstallGenerator( this->Makefile->AddInstallGenerator(
new cmInstallFilesGenerator(this->Files, new cmInstallFilesGenerator(this->Files,
this->Destination.c_str(), false, destination.c_str(), false,
no_permissions, no_configurations, no_permissions, no_configurations,
no_component, no_rename)); no_component, no_rename));
} }

8
Source/cmInstallProgramsCommand.cxx
View File

@ -79,6 +79,12 @@ void cmInstallProgramsCommand::FinalPass()
} }
} }
// 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. // Use a file install generator.
const char* no_permissions = ""; const char* no_permissions = "";
const char* no_rename = ""; const char* no_rename = "";
@ -86,7 +92,7 @@ void cmInstallProgramsCommand::FinalPass()
std::vector<std::string> no_configurations; std::vector<std::string> no_configurations;
this->Makefile->AddInstallGenerator( this->Makefile->AddInstallGenerator(
new cmInstallFilesGenerator(this->Files, new cmInstallFilesGenerator(this->Files,
this->Destination.c_str(), true, destination.c_str(), true,
no_permissions, no_configurations, no_permissions, no_configurations,
no_component, no_rename)); no_component, no_rename));
} }