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

Partial fix from bug #10503, use full paths to fix custom commands. 

This fixes tests ExternalProject and LinkDirectory for VS 2010.
This commit is contained in:
Bill Hoffman 2010-04-02 14:09:06 -04:00
parent a63dc3271a
commit cf3e42f811
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -236,7 +236,7 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
{
std::string stampName = cmake::GetCMakeFilesDirectoryPostSlash();
stampName += "generate.stamp";
const char* dsprule =
const char* dsprule =
this->Makefile->GetRequiredDefinition("CMAKE_COMMAND");
cmCustomCommandLine commandLine;
commandLine.push_back(dsprule);
@ -261,7 +261,9 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
START_OUTPUT, UNCHANGED, true);
commandLine.push_back(args);
commandLine.push_back("--check-stamp-file");
commandLine.push_back(stampName.c_str());
std::string stampFilename = this->Convert(stampName.c_str(), FULL,
SHELL);
commandLine.push_back(stampFilename.c_str());
std::vector<std::string> const& listFiles = this->Makefile->GetListFiles();

2
Source/cmLocalVisualStudioGenerator.cxx
View File

@ -169,7 +169,7 @@ cmLocalVisualStudioGenerator
script += newline;
newline = newline_text;
script += "cd ";
script += this->Convert(workingDirectory, START_OUTPUT, SHELL);
script += this->Convert(workingDirectory, FULL, SHELL);
// Change the working drive.
if(workingDirectory[0] && workingDirectory[1] == ':')