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

[cmake-commits at cmake.org]

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

Modified Files:
	cmExtraCodeBlocksGenerator.cxx 
Log Message:
As in the Eclipse generator: don't insert the edit_cache target if it is ccmake, since this doesn't work in the output tab of the IDE


Index: cmExtraCodeBlocksGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmExtraCodeBlocksGenerator.cxx,v
retrieving revision 1.27
retrieving revision 1.28
diff -C 2 -d -r1.27 -r1.28
*** cmExtraCodeBlocksGenerator.cxx	6 Sep 2009 09:43:51 -0000	1.27
--- cmExtraCodeBlocksGenerator.cxx	10 Sep 2009 17:44:02 -0000	1.28
***************
*** 339,342 ****
--- 339,344 ----
          {
            case cmTarget::GLOBAL_TARGET:
+             {
+             bool insertTarget = false;
              // Only add the global targets from CMAKE_BINARY_DIR, 
              // not from the subdirs
***************
*** 344,350 ****
                         makefile->GetHomeOutputDirectory())==0)
                {
                this->AppendTarget(fout, ti->first.c_str(), 0, 
!                                  make.c_str(), makefile, compiler.c_str());
                }
              break;
            case cmTarget::UTILITY:
--- 346,367 ----
                         makefile->GetHomeOutputDirectory())==0)
                {
+               insertTarget = true;
+               // only add the "edit_cache" target if it's not ccmake, because
+               // this will not work within the IDE
+               if (ti->first == "edit_cache")
+                 {
+                 if (strstr(makefile->GetRequiredDefinition
+                                        ("CMAKE_EDIT_COMMAND"), "ccmake")!=NULL)
+                   {
+                   insertTarget = false;
+                   }
+                 }
+               }
+             if (insertTarget)
+               {
                this->AppendTarget(fout, ti->first.c_str(), 0, 
!                                make.c_str(), makefile, compiler.c_str());
                }
+             }
              break;
            case cmTarget::UTILITY: