From e8b8f0eda8f5d757582310a9f5d58c90d7074e3f Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 9 Dec 2011 12:43:06 -0500 Subject: [PATCH] Xcode: Create separate rerun dependencies for subprojects (#12616) Generate the rerun dependency file for the top-level project() and each subdirectory project() into the corresponding build directory. Do not clobber them all with the one for the last subproject. This mistake was left from when the Xcode generator did not produce subprojects. --- Source/cmGlobalXCodeGenerator.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 32eaef837..859503f51 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -458,8 +458,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile( std::vector::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";