Merge topic 'xcode-ReRunCMake-full-path'

388a321 Xcode: Fix ReRunCMake.make path to cmake.check_cache (#13603)
This commit is contained in:
David Cole 2012-10-31 16:34:08 -04:00 committed by CMake Topic Stage
commit d8233e5837

View File

@ -495,8 +495,12 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
(this->CurrentReRunCMakeMakefile.c_str()); (this->CurrentReRunCMakeMakefile.c_str());
makefileStream.SetCopyIfDifferent(true); makefileStream.SetCopyIfDifferent(true);
makefileStream << "# Generated by CMake, DO NOT EDIT\n"; makefileStream << "# Generated by CMake, DO NOT EDIT\n";
makefileStream << cmake::GetCMakeFilesDirectoryPostSlash(); std::string checkCache = mf->GetHomeOutputDirectory();
makefileStream << "cmake.check_cache: "; checkCache += "/";
checkCache += cmake::GetCMakeFilesDirectoryPostSlash();
checkCache += "cmake.check_cache";
makefileStream << this->ConvertToRelativeForMake(checkCache.c_str())
<< ": ";
for(std::vector<std::string>::const_iterator i = lfiles.begin(); for(std::vector<std::string>::const_iterator i = lfiles.begin();
i != lfiles.end(); ++i) i != lfiles.end(); ++i)
{ {