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

Xcode: Fix ReRunCMake.make path to cmake.check_cache (#13603) 

The path must be either absolute or relative to the working directory
from which the makefile will be loaded.  In subprojects this is not
relative to the top of the build tree.

Reported-by: David Weese <tre@gmx.de>
This commit is contained in:
Brad King 2012-10-24 13:33:46 -04:00
parent 2362bc8e80
commit 388a3216fc
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmGlobalXCodeGenerator.cxx
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)
{ {