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

BUG: Directory installation pattern matching should be case insensitive on some platforms.

Browse Source
This commit is contained in:
Brad King 2006-08-21 17:47:51 -04:00
parent 08398a9f0c
commit c99dcc30be
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmFileCommand.cxx
View File

@ -400,6 +400,13 @@ public:
// Get the properties from rules matching this input file. // Get the properties from rules matching this input file.
MatchProperties CollectMatchProperties(const char* file) MatchProperties CollectMatchProperties(const char* file)
{ {
// Match rules are case-insensitive on some platforms.
#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
std::string lower = cmSystemTools::LowerCase(file);
file = lower.c_str();
#endif
// Collect properties from all matching rules.
MatchProperties result; MatchProperties result;
for(std::vector<MatchRule>::iterator mr = this->MatchRules.begin(); for(std::vector<MatchRule>::iterator mr = this->MatchRules.begin();
mr != this->MatchRules.end(); ++mr) mr != this->MatchRules.end(); ++mr)

5
Source/cmInstallCommand.cxx
View File

@ -938,7 +938,12 @@ cmInstallCommand::HandleDirectoryMode(std::vector<std::string> const& args)
else if(doing_regex) else if(doing_regex)
{ {
literal_args += " REGEX \""; literal_args += " REGEX \"";
// Match rules are case-insensitive on some platforms.
#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
std::string regex = cmSystemTools::LowerCase(args[i]);
#else
std::string regex = args[i]; std::string regex = args[i];
#endif
cmSystemTools::ReplaceString(regex, "\\", "\\\\"); cmSystemTools::ReplaceString(regex, "\\", "\\\\");
literal_args += regex; literal_args += regex;
literal_args += "\""; literal_args += "\"";