mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 07:08:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

BUG: Fixed optional file install support for multi-configuration generators.

Browse Source
This commit is contained in:
Brad King
2006-02-19 19:29:30 -05:00
parent c21287552b
commit 3ca9ef09b7
3 changed files with 21 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmFileCommand.cxx
+8 -21
View File
@@ -290,13 +290,6 @@ bool cmFileCommand::HandleInstallCommand(
const char* destdir = cmSystemTools::GetEnv("DESTDIR");
std::string extra_dir = "";
if ( build_type )
{
extra_dir = build_type;
std::string btype = cmSystemTools::LowerCase(build_type);
}
std::vector<std::string> files;
int itype = cmTarget::INSTALL_FILES;
@@ -553,14 +546,9 @@ bool cmFileCommand::HandleInstallCommand(
}
// Reconstruct the source file path taking into account the
// extra directory and possible new file name.
// possibly new file name.
cmOStringStream str;
str << cmSystemTools::GetFilenamePath(ctarget) << "/";
if ( extra_dir.size() > 0 )
{
str << extra_dir << "/";
}
str << fname;
str << cmSystemTools::GetFilenamePath(ctarget) << "/" << fname;
ctarget = str.str();
}
break;
@@ -597,23 +585,22 @@ bool cmFileCommand::HandleInstallCommand(
}
// Reconstruct the source file path taking into account the
// extra directory and possible new file name.
// possibly new file name.
cmOStringStream str;
str << cmSystemTools::GetFilenamePath(ctarget) << "/";
if ( extra_dir.size() > 0 )
{
str << extra_dir << "/";
}
str << fname;
str << cmSystemTools::GetFilenamePath(ctarget) << "/" << fname;
ctarget = str.str();
}
break;
}
std::string message;
if ( !cmSystemTools::SameFile(ctarget.c_str(), destfile.c_str()) )
{
if ( cmSystemTools::FileExists(ctarget.c_str()) )
{
message = "Installing ";
message += destfile.c_str();
m_Makefile->DisplayStatus(message.c_str(), -1);
cmSystemTools::RemoveFile(destfile.c_str());
if ( !cmSystemTools::CopyFileAlways(ctarget.c_str(),
destination.c_str()) )