diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-04-03 20:20:20 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-04-03 20:20:20 (GMT) |
| commit | 2fcae1932c4921868056ee404d448adec563dd6e (patch) | |
| tree | 17c9ef35baf5089c0937cd461d4681f127f8d9c6 /Source | |
| parent | c98d15e8a3bc0ff8a4dcbe20ab3dfd12ed263504 (diff) | |
| download | CMake-2fcae1932c4921868056ee404d448adec563dd6e.zip CMake-2fcae1932c4921868056ee404d448adec563dd6e.tar.gz CMake-2fcae1932c4921868056ee404d448adec563dd6e.tar.bz2 | |
ENH: make sure include and lib dirs are unix paths
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmIncludeDirectoryCommand.cxx | 4 | ||||
| -rw-r--r-- | Source/cmLinkDirectoriesCommand.cxx | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Source/cmIncludeDirectoryCommand.cxx b/Source/cmIncludeDirectoryCommand.cxx index 3bc7787..eb21288 100644 --- a/Source/cmIncludeDirectoryCommand.cxx +++ b/Source/cmIncludeDirectoryCommand.cxx @@ -39,7 +39,9 @@ bool cmIncludeDirectoryCommand::InitialPass(std::vector<std::string> const& args { 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; } diff --git a/Source/cmLinkDirectoriesCommand.cxx b/Source/cmLinkDirectoriesCommand.cxx index 30f8e1f..90f54b61 100644 --- a/Source/cmLinkDirectoriesCommand.cxx +++ b/Source/cmLinkDirectoriesCommand.cxx @@ -27,7 +27,9 @@ bool cmLinkDirectoriesCommand::InitialPass(std::vector<std::string> const& args) for(std::vector<std::string>::const_iterator i = args.begin(); 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; } |