[Cmake-commits] [cmake-commits] king committed cmExtraEclipseCDT4Generator.cxx 1.27.2.3 1.27.2.4 cmGlobalXCodeGenerator.cxx 1.232.2.6 1.232.2.7

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-8
	cmExtraEclipseCDT4Generator.cxx cmGlobalXCodeGenerator.cxx 
Log Message:
CMake 2.8.1-rc3


Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.232.2.6
retrieving revision 1.232.2.7
diff -C 2 -d -r1.232.2.6 -r1.232.2.7
*** cmGlobalXCodeGenerator.cxx	28 Jan 2010 21:47:56 -0000	1.232.2.6
--- cmGlobalXCodeGenerator.cxx	16 Feb 2010 15:35:33 -0000	1.232.2.7
***************
*** 2759,2762 ****
--- 2759,2778 ----
      }
  
+   // Put this last so it can override existing settings
+   // Convert "CMAKE_XCODE_ATTRIBUTE_*" variables directly.
+   {
+     std::vector<std::string> vars = this->CurrentMakefile->GetDefinitions();
+     for(std::vector<std::string>::const_iterator i = vars.begin();
+         i != vars.end(); ++i)
+     {
+       if(i->find("CMAKE_XCODE_ATTRIBUTE_") == 0)
+       {
+         buildSettings->AddAttribute(i->substr(22).c_str(),
+           this->CreateString(
+             this->CurrentMakefile->GetDefinition(i->c_str())));
+       }
+     }
+   }
+ 
    std::string symroot = root->GetMakefile()->GetCurrentOutputDirectory();
    symroot += "/build";

Index: cmExtraEclipseCDT4Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmExtraEclipseCDT4Generator.cxx,v
retrieving revision 1.27.2.3
retrieving revision 1.27.2.4
diff -C 2 -d -r1.27.2.3 -r1.27.2.4
*** cmExtraEclipseCDT4Generator.cxx	28 Jan 2010 21:47:49 -0000	1.27.2.3
--- cmExtraEclipseCDT4Generator.cxx	16 Feb 2010 15:35:33 -0000	1.27.2.4
***************
*** 44,50 ****
    entry.Brief = "Generates Eclipse CDT 4.0 project files.";
    entry.Full =
!     "Project files for Eclipse will be created in the top directory "
!     "and will have a linked resource to every subdirectory which "
!     "features a CMakeLists.txt file containing a PROJECT() call."
      "Additionally a hierarchy of makefiles is generated into the "
      "build tree. The appropriate make program can build the project through "
--- 44,50 ----
    entry.Brief = "Generates Eclipse CDT 4.0 project files.";
    entry.Full =
!     "Project files for Eclipse will be created in the top directory. "
!     "In out of source builds, a linked resource to the top level source "
!     "directory will be created."
      "Additionally a hierarchy of makefiles is generated into the "
      "build tree. The appropriate make program can build the project through "
***************
*** 393,414 ****
      {
      fout << "\t<linkedResources>\n";
!     // for each sub project create a linked resource to the source dir
!     // - only if it is an out-of-source build
!     for (std::map<cmStdString, std::vector<cmLocalGenerator*> >::const_iterator
!           it = this->GlobalGenerator->GetProjectMap().begin();
!          it != this->GlobalGenerator->GetProjectMap().end();
!          ++it)
!       {
!       std::string linkSourceDirectory = this->GetEclipsePath(
!                             it->second[0]->GetMakefile()->GetStartDirectory());
!       // .project dir can't be subdir of a linked resource dir
!       if (!cmSystemTools::IsSubDirectory(this->HomeOutputDirectory.c_str(),
                                           linkSourceDirectory.c_str()))
!         {
!         this->AppendLinkedResource(fout, it->first,
!                                    this->GetEclipsePath(linkSourceDirectory));
!         this->SrcLinkedResources.push_back(it->first);
!         }
        }
      // for EXECUTABLE_OUTPUT_PATH when not in binary dir
      this->AppendOutLinkedResource(fout,
--- 393,414 ----
      {
      fout << "\t<linkedResources>\n";
!     // create a linked resource to CMAKE_SOURCE_DIR
!     // (this is not done anymore for each project because of 
!     // http://public.kitware.com/Bug/view.php?id=9978 and because I found it 
!     // actually quite confusing in bigger projects with many directories and 
!     // projects, Alex
! 
!     std::string sourceLinkedResourceName = "[Source directory]";
!     std::string linkSourceDirectory = this->GetEclipsePath(
!                                                       mf->GetStartDirectory());
!     // .project dir can't be subdir of a linked resource dir
!     if (!cmSystemTools::IsSubDirectory(this->HomeOutputDirectory.c_str(),
                                           linkSourceDirectory.c_str()))
!       {
!       this->AppendLinkedResource(fout, sourceLinkedResourceName,
!                                  this->GetEclipsePath(linkSourceDirectory));
!       this->SrcLinkedResources.push_back(sourceLinkedResourceName);
        }
+ 
      // for EXECUTABLE_OUTPUT_PATH when not in binary dir
      this->AppendOutLinkedResource(fout,