diff options
| author | David Cole <david.cole@kitware.com> | 2012-10-31 20:34:08 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-10-31 20:34:08 (GMT) |
| commit | d8233e58372e18200a83e66732bc7918aadb06f4 (patch) | |
| tree | 5c9d3914c44832aa1f31b498861f6afb549da815 /Source | |
| parent | bd394d42e6adda56d36236b33b61338e76e810ed (diff) | |
| parent | 388a3216fc9d22531b40963a81d70900c602c7fc (diff) | |
| download | CMake-d8233e58372e18200a83e66732bc7918aadb06f4.zip CMake-d8233e58372e18200a83e66732bc7918aadb06f4.tar.gz CMake-d8233e58372e18200a83e66732bc7918aadb06f4.tar.bz2 | |
Merge topic 'xcode-ReRunCMake-full-path'
388a321 Xcode: Fix ReRunCMake.make path to cmake.check_cache (#13603)
Diffstat (limited to 'Source')
| -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) { |