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

BUG: Avoid putting double-slashes in fromFile during installation. Also added regex debugging copy of the expression in string form.

This commit is contained in:
Brad King 2006-08-25 12:11:21 -04:00
parent 24cdf8aa6c
commit b4e1de7886
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmFileCommand.cxx
View File

@ -393,7 +393,9 @@ public:
{
cmsys::RegularExpression Regex;
MatchProperties Properties;
MatchRule(std::string const& regex): Regex(regex.c_str()) {}
std::string RegexString;
MatchRule(std::string const& regex):
Regex(regex.c_str()), RegexString(regex) {}
};
std::vector<MatchRule> MatchRules;
@ -1268,8 +1270,11 @@ bool cmFileCommand::HandleInstallCommand(
// Construct the full path to the source file. The file name may
// have been changed above.
std::string fromFile = fromDir;
fromFile += "/";
fromFile += fromName;
if(!fromName.empty())
{
fromFile += "/";
fromFile += fromName;
}
std::string message;
if(!cmSystemTools::SameFile(fromFile.c_str(), toFile.c_str()))