[cmake-commits] hoffman committed cmGlobalXCodeGenerator.cxx 1.130 1.131

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalXCodeGenerator.cxx 
Log Message:
ENH: fix for external object test


Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- cmGlobalXCodeGenerator.cxx	17 Feb 2007 13:38:40 -0000	1.130
+++ cmGlobalXCodeGenerator.cxx	17 Feb 2007 16:43:47 -0000	1.131
@@ -123,6 +123,8 @@
   mf->AddDefinition("CMAKE_GENERATOR_CC", "gcc");
   mf->AddDefinition("CMAKE_GENERATOR_CXX", "g++");
   mf->AddDefinition("CMAKE_GENERATOR_NO_COMPILER_ENV", "1");
+  // initialize Architectures so it can be used by 
+  //  GetTargetObjectFileDirectories
   this->cmGlobalGenerator::EnableLanguage(lang, mf);
     const char* osxArch = 
       mf->GetDefinition("CMAKE_OSX_ARCHITECTURES");
@@ -2166,6 +2168,10 @@
       this->CurrentMakefile->GetDefinition("CMAKE_OSX_SYSROOT");
   if(osxArch && sysroot)
     {
+    // recompute this as it may have been changed since enable language
+    this->Architectures.clear();
+    cmSystemTools::ExpandListArgument(std::string(osxArch),
+                                      this->Architectures);
     if(this->Architectures.size() > 1)
       {
       buildSettings->AddAttribute("SDKROOT",