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

ENH: make sure include and lib dirs are unix paths

This commit is contained in:
Bill Hoffman 2006-04-03 16:20:20 -04:00
parent c98d15e8a3
commit 2fcae1932c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmIncludeDirectoryCommand.cxx
View File

@ -39,7 +39,9 @@ bool cmIncludeDirectoryCommand::InitialPass(std::vector<std::string> const& args
{ {
cmSystemTools::Error("Empty Include Directory Passed into INCLUDE_DIRECTORIES command."); cmSystemTools::Error("Empty Include Directory Passed into INCLUDE_DIRECTORIES command.");
} }
this->Makefile->AddIncludeDirectory((*i).c_str(), before); std::string unixPath = *i;
cmSystemTools::ConvertToUnixSlashes(unixPath);
this->Makefile->AddIncludeDirectory(unixPath.c_str(), before);
} }
return true; return true;
} }

4
Source/cmLinkDirectoriesCommand.cxx
View File

@ -27,7 +27,9 @@ bool cmLinkDirectoriesCommand::InitialPass(std::vector<std::string> const& args)
for(std::vector<std::string>::const_iterator i = args.begin(); for(std::vector<std::string>::const_iterator i = args.begin();
i != args.end(); ++i) i != args.end(); ++i)
{ {
this->Makefile->AddLinkDirectory((*i).c_str()); std::string unixPath = *i;
cmSystemTools::ConvertToUnixSlashes(unixPath);
this->Makefile->AddLinkDirectory(unixPath.c_str());
} }
return true; return true;
} }