diff options
| author | David Cole <david.cole@kitware.com> | 2011-12-16 15:12:36 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-12-16 15:12:36 (GMT) |
| commit | f189c5d7d340eba74b0a812fb873695dba487316 (patch) | |
| tree | 80c71d7e0072f5072550a1687b3d15aa5abfc399 /Source | |
| parent | 7e6c8edb15e98bc932dabd7db051dc2d0bd8427f (diff) | |
| parent | e8b8f0eda8f5d757582310a9f5d58c90d7074e3f (diff) | |
| download | CMake-f189c5d7d340eba74b0a812fb873695dba487316.zip CMake-f189c5d7d340eba74b0a812fb873695dba487316.tar.gz CMake-f189c5d7d340eba74b0a812fb873695dba487316.tar.bz2 | |
Merge topic 'xcode-rerun-issue-12616'
e8b8f0e Xcode: Create separate rerun dependencies for subprojects (#12616)
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 32eaef8..859503f 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -458,8 +458,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile( std::vector<std::string>::iterator new_end = std::unique(lfiles.begin(), lfiles.end()); lfiles.erase(new_end, lfiles.end()); - std::string dir = mf->GetHomeOutputDirectory(); - this->CurrentReRunCMakeMakefile = dir; + this->CurrentReRunCMakeMakefile = mf->GetStartOutputDirectory(); this->CurrentReRunCMakeMakefile += "/CMakeScripts"; cmSystemTools::MakeDirectory(this->CurrentReRunCMakeMakefile.c_str()); this->CurrentReRunCMakeMakefile += "/ReRunCMake.make"; |