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

Revert back to 1.5, since it is fixed in ConvertToOutputPath and this breaks Windows 98

Browse Source
This commit is contained in:
Andy Cedilnik 2002-11-22 15:44:10 -05:00
parent 934d7d3dd6
commit be986c6cae
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmLocalVisualStudio6Generator.cxx
View File

@ -164,10 +164,10 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmSourceGroup& sourceGroup)
std::string makefileIn = m_Makefile->GetStartDirectory(); std::string makefileIn = m_Makefile->GetStartDirectory();
makefileIn += "/"; makefileIn += "/";
makefileIn += "CMakeLists.txt"; makefileIn += "CMakeLists.txt";
std::string makefileInNC = makefileIn;
makefileIn = cmSystemTools::ConvertToOutputPath(makefileIn.c_str()); makefileIn = cmSystemTools::ConvertToOutputPath(makefileIn.c_str());
std::string dsprule = "${CMAKE_COMMAND}"; std::string dsprule = "${CMAKE_COMMAND}";
m_Makefile->ExpandVariablesInString(dsprule); m_Makefile->ExpandVariablesInString(dsprule);
dsprule = cmSystemTools::ConvertToOutputPath(dsprule.c_str());
std::string args = makefileIn; std::string args = makefileIn;
args += " -H"; args += " -H";
args += args +=
@ -203,7 +203,7 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmSourceGroup& sourceGroup)
std::vector<std::string> outputs; std::vector<std::string> outputs;
outputs.push_back(dspname); outputs.push_back(dspname);
cmCustomCommand cc(makefileInNC.c_str(), dsprule.c_str(), cmCustomCommand cc(makefileIn.c_str(), dsprule.c_str(),
args.c_str(), args.c_str(),
listFiles, listFiles,
outputs); outputs);
@ -555,7 +555,7 @@ cmLocalVisualStudio6Generator::CreateTargetRules(const cmTarget &target,
{ {
customRuleCode += "\t"; customRuleCode += "\t";
} }
customRuleCode += cc.GetCommand() + " " + cc.GetArguments(); customRuleCode += cmSystemTools::ConvertToOutputPath(cc.GetCommand().c_str()) + " " + cc.GetArguments();
} }
} }