[Cmake-commits] [cmake-commits] alex committed cmExtraCodeBlocksGenerator.cxx 1.26 1.27

[cmake-commits at cmake.org]

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

Modified Files:
	cmExtraCodeBlocksGenerator.cxx 
Log Message:
Improve the algorithm which skips targets so they are not added to the codeblocks GUI.

-add all global targets from CMAKE_BINARY_DIR to the menu, but not from the subdirs
-add all utility targets to the menu, except the Nightly/Experimental/Continuous-"sub"targets as e.

Alex


Index: cmExtraCodeBlocksGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmExtraCodeBlocksGenerator.cxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -C 2 -d -r1.26 -r1.27
*** cmExtraCodeBlocksGenerator.cxx	7 Jul 2009 18:02:22 -0000	1.26
--- cmExtraCodeBlocksGenerator.cxx	6 Sep 2009 09:43:51 -0000	1.27
***************
*** 324,336 ****
          "      <Build>\n";
  
-   bool installTargetCreated = false;
-   bool installStripTargetCreated = false;
-   bool testTargetCreated = false;
-   bool experimentalTargetCreated = false;
-   bool nightlyTargetCreated = false;
-   bool packageTargetCreated = false;
-   bool packageSourceTargetCreated = false;
-   bool rebuildCacheTargetCreated = false;
- 
    this->AppendTarget(fout, "all", 0, make.c_str(), mf, compiler.c_str());
  
--- 324,327 ----
***************
*** 347,395 ****
          switch(ti->second.GetType())
          {
-           case cmTarget::UTILITY:
            case cmTarget::GLOBAL_TARGET:
!             // only add these targets once
!             if ((ti->first=="install") && (installTargetCreated==false)) 
!               {
!               installTargetCreated=true;
!               }
!             else if ((ti->first=="install/strip") 
!                       && (installStripTargetCreated==false)) 
!               {
!               installStripTargetCreated=true;
!               }
!             else if ((ti->first=="test") && (testTargetCreated==false)) 
!               {
!               testTargetCreated=true;
!               }
!             else if ((ti->first=="Experimental") 
!                       && (experimentalTargetCreated==false)) 
!               {
!               experimentalTargetCreated=true;
!               }
!             else if ((ti->first=="Nightly") && (nightlyTargetCreated==false)) 
!               {
!               nightlyTargetCreated=true;
!               }
!             else if ((ti->first=="package") && (packageTargetCreated==false)) 
!               {
!               packageTargetCreated=true;
!               }
!             else if ((ti->first=="package_source") 
!                       && (packageSourceTargetCreated==false)) 
!               {
!               packageSourceTargetCreated=true;
!               }
!             else if ((ti->first=="rebuild_cache") 
!                       && (rebuildCacheTargetCreated==false)) 
                {
!               rebuildCacheTargetCreated=true;
                }
!             else
                {
                break;
                }
              this->AppendTarget(fout, ti->first.c_str(), 0, 
!                                make.c_str(), makefile, compiler.c_str());
              break;
            case cmTarget::EXECUTABLE:
--- 338,364 ----
          switch(ti->second.GetType())
          {
            case cmTarget::GLOBAL_TARGET:
!             // Only add the global targets from CMAKE_BINARY_DIR, 
!             // not from the subdirs
!             if (strcmp(makefile->GetStartOutputDirectory(), 
!                        makefile->GetHomeOutputDirectory())==0)
                {
!               this->AppendTarget(fout, ti->first.c_str(), 0, 
!                                  make.c_str(), makefile, compiler.c_str());
                }
!             break;
!           case cmTarget::UTILITY:
!             // Add all utility targets, except the Nightly/Continuous/
!             // Experimental-"sub"targets as e.g. NightlyStart
!             if (((ti->first.find("Nightly")==0)   &&(ti->first!="Nightly"))
!              || ((ti->first.find("Continuous")==0)&&(ti->first!="Continuous"))
!              || ((ti->first.find("Experimental")==0) 
!                                                && (ti->first!="Experimental")))
                {
                break;
                }
+ 
              this->AppendTarget(fout, ti->first.c_str(), 0, 
!                                  make.c_str(), makefile, compiler.c_str());
              break;
            case cmTarget::EXECUTABLE: