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

Merge branch 'vs10-path-issue'

This commit is contained in:
Brad King 2010-06-22 09:58:57 -04:00
parent 84fd223aee 616462ce45
commit d4206dc62b
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGlobalVisualStudio8Generator.cxx
View File

@ -154,8 +154,6 @@ void cmGlobalVisualStudio8Generator::AddCheckTarget()
stampFile += "/";
stampFile += cmake::GetCMakeFilesDirectoryPostSlash();
stampFile += "generate.stamp";
stampFile = generators[0]->Convert(stampFile.c_str(),
cmLocalGenerator::START_OUTPUT);
fout << stampFile << "\n";
stamps.push_back(stampFile);
}

8
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -270,9 +270,11 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
cmCustomCommandLines commandLines;
commandLines.push_back(commandLine);
const char* no_working_directory = 0;
this->Makefile->AddCustomCommandToOutput(stampName.c_str(), listFiles,
makefileIn.c_str(), commandLines,
comment.c_str(),
std::string fullpathStampName = this->Convert(stampName.c_str(), FULL,
UNCHANGED);
this->Makefile->AddCustomCommandToOutput(fullpathStampName.c_str(),
listFiles, makefileIn.c_str(),
commandLines, comment.c_str(),
no_working_directory, true);
if(cmSourceFile* file = this->Makefile->GetSource(makefileIn.c_str()))
{

3
Source/cmake.cxx
View File

@ -3906,6 +3906,9 @@ static bool cmakeCheckStampFile(const char* stampName)
// build system is really out of date.
std::cout << "CMake is re-running because " << stampName
<< " is out-of-date.\n";
std::cout << " the file '" << dep << "'\n";
std::cout << " is newer than '" << stampDepends << "'\n";
std::cout << " result='" << result << "'\n";
return false;
}
}