diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2007-02-17 16:43:47 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2007-02-17 16:43:47 (GMT) |
| commit | 63e2a9dffa85a7fce841d491f00f90146c253976 (patch) | |
| tree | 6524be82f2460b1177ec3270555679b7c2f6c116 /Source/cmGlobalXCodeGenerator.cxx | |
| parent | f7cd9f76ce5f49183b519007e8e0bb20f2ae664e (diff) | |
| download | CMake-63e2a9dffa85a7fce841d491f00f90146c253976.zip CMake-63e2a9dffa85a7fce841d491f00f90146c253976.tar.gz CMake-63e2a9dffa85a7fce841d491f00f90146c253976.tar.bz2 | |
ENH: fix for external object test
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 2bed855..f457817 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -123,6 +123,8 @@ void cmGlobalXCodeGenerator::EnableLanguage(std::vector<std::string>const& 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 @@ void cmGlobalXCodeGenerator 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", |