mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-22 06:59:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

ENH: Enabled new WORKING_DIRECTORY option to ADD_CUSTOM_COMMAND and ADD_CUSTOM_TARGET on VS 6 generator.

Browse Source
This commit is contained in:
Brad King
2006-02-08 12:01:21 -05:00
parent 7a3ed4644b
commit c6741363de
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmLocalVisualStudio6Generator.cxx
View File

@@ -303,15 +303,13 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
target.GetPreBuildCommands().begin();
cr != target.GetPreBuildCommands().end(); ++cr)
{
this->AddUtilityCommandHack(target, count++, depends,
cr->GetCommandLines());
this->AddUtilityCommandHack(target, count++, depends, *cr);
}
for (std::vector<cmCustomCommand>::const_iterator cr =
target.GetPostBuildCommands().begin();
cr != target.GetPostBuildCommands().end(); ++cr)
{
this->AddUtilityCommandHack(target, count++, depends,
cr->GetCommandLines());
this->AddUtilityCommandHack(target, count++, depends, *cr);
}
}
@@ -503,7 +501,7 @@ void
cmLocalVisualStudio6Generator
::AddUtilityCommandHack(cmTarget& target, int count,
std::vector<std::string>& depends,
const cmCustomCommandLines& commandLines)
const cmCustomCommand& origCommand)
{
// Create a fake output that forces the rule to run.
char* output = new char[(strlen(m_Makefile->GetStartOutputDirectory()) +
@@ -518,9 +516,9 @@ cmLocalVisualStudio6Generator
m_Makefile->AddCustomCommandToOutput(output,
depends,
no_main_dependency,
commandLines,
no_comment,
no_working_directory);
origCommand.GetCommandLines(),
origCommand.GetComment(),
origCommand.GetWorkingDirectory());
// Replace the dependencies with the output of this rule so that the
// next rule added will run after this one.