[Cmake-commits] [cmake-commits] david.cole committed cmGlobalXCodeGenerator.cxx 1.219 1.220

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Jul 24 15:58:24 EDT 2009


Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv1394/Source

Modified Files:
	cmGlobalXCodeGenerator.cxx 
Log Message:
BUG: Additional fix necessary for issue #8481 so that Xcode builds do not write files into the source tree. Also add a test that runs last to check for local modifications in CMake_SOURCE_DIR based on whether 'cvs -q -n up -dP' output is empty. Test fails on dashboard runs when there are local modifications. Test passes on non-dashboard runs with local modifications so that CMake developers may have mods when running the test locally.


Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.219
retrieving revision 1.220
diff -C 2 -d -r1.219 -r1.220
*** cmGlobalXCodeGenerator.cxx	22 Jul 2009 15:14:23 -0000	1.219
--- cmGlobalXCodeGenerator.cxx	24 Jul 2009 19:58:22 -0000	1.220
***************
*** 2715,2718 ****
--- 2715,2723 ----
                                  this->CreateString(deploymentTarget));
      }
+ 
+   std::string symroot = root->GetMakefile()->GetCurrentOutputDirectory();
+   symroot += "/build";
+   buildSettings->AddAttribute("SYMROOT", this->CreateString(symroot.c_str()));
+ 
    for( std::vector<cmXCodeObject*>::iterator i = configs.begin();
         i != configs.end(); ++i)
***************
*** 2720,2723 ****
--- 2725,2729 ----
      (*i)->AddAttribute("buildSettings", buildSettings);
      }
+ 
    this->RootObject->AddAttribute("buildConfigurationList", 
                               this->CreateObjectReference(configlist));



More information about the Cmake-commits mailing list