diff options
| author | Brad King <brad.king@kitware.com> | 2012-10-24 17:33:46 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-10-24 18:13:19 (GMT) |
| commit | 388a3216fc9d22531b40963a81d70900c602c7fc (patch) | |
| tree | 029da80854f468118200f97f5b290428ecdf2d63 /Source/cmGlobalXCodeGenerator.cxx | |
| parent | 2362bc8e80ee657dd733bbf4b698199ce3b656fe (diff) | |
| download | CMake-388a3216fc9d22531b40963a81d70900c602c7fc.zip CMake-388a3216fc9d22531b40963a81d70900c602c7fc.tar.gz CMake-388a3216fc9d22531b40963a81d70900c602c7fc.tar.bz2 | |
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>
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 30d8f18..5b2ddd8 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -495,8 +495,12 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile( (this->CurrentReRunCMakeMakefile.c_str()); makefileStream.SetCopyIfDifferent(true); makefileStream << "# Generated by CMake, DO NOT EDIT\n"; - makefileStream << cmake::GetCMakeFilesDirectoryPostSlash(); - makefileStream << "cmake.check_cache: "; + std::string checkCache = mf->GetHomeOutputDirectory(); + checkCache += "/"; + checkCache += cmake::GetCMakeFilesDirectoryPostSlash(); + checkCache += "cmake.check_cache"; + makefileStream << this->ConvertToRelativeForMake(checkCache.c_str()) + << ": "; for(std::vector<std::string>::const_iterator i = lfiles.begin(); i != lfiles.end(); ++i) { |