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

file(INSTALL): Do not pre-create DESTINATION for DIRECTORY

Browse Source 
When installing a DIRECTORY, do not pre-create the DESTINATION.  The
cmFileCopier::InstallDirectory method will create the directory anyway.
Give it a chance to detect whether the directory already exists or not.
This commit is contained in:
Brad King 2014-06-23 13:52:17 -04:00
parent f0a0196250
commit f701b0b7f7
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmFileCommand.cxx
View File

@ -2057,6 +2057,8 @@ bool cmFileInstaller::HandleInstallDestination()
this->DestDirLength = int(sdestdir.size()); this->DestDirLength = int(sdestdir.size());
} }
if(this->InstallType != cmInstallType_DIRECTORY)
{
if ( !cmSystemTools::FileExists(destination.c_str()) ) if ( !cmSystemTools::FileExists(destination.c_str()) )
{ {
if ( !cmSystemTools::MakeDirectory(destination.c_str()) ) if ( !cmSystemTools::MakeDirectory(destination.c_str()) )
@ -2074,6 +2076,7 @@ bool cmFileInstaller::HandleInstallDestination()
this->FileCommand->SetError(errstring); this->FileCommand->SetError(errstring);
return false; return false;
} }
}
return true; return true;
} }