From 2fcae1932c4921868056ee404d448adec563dd6e Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Mon, 3 Apr 2006 16:20:20 -0400 Subject: ENH: make sure include and lib dirs are unix paths --- Source/cmIncludeDirectoryCommand.cxx | 4 +++- 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 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 const& args) for(std::vector::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; } -- cgit v0.12