[Cmake-commits] [cmake-commits] alex committed cmExtraEclipseCDT4Generator.cxx 1.28 1.29 cmExtraCodeBlocksGenerator.cxx 1.33 1.34

[cmake-commits at cmake.org]

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

Modified Files:
	cmExtraEclipseCDT4Generator.cxx cmExtraCodeBlocksGenerator.cxx 
Log Message:
make testing the CodeBlocks and Eclipse generators easier by not requiring the CMAKE_EDIT_COMMAND variable

Both generators use the CMAKE_EDIT_COMMAND variable to determine whether
they should add the edit_cache target, i.e. they don't add it if it's
ccmake, since this does not work inside the output log view of
Eclipse/Codeblocks. But instead of requiring the variable to be set they now
check it for 0 and handle this appropriately. This should help Dave getting
some testing for them :-)

Alex


Index: cmExtraCodeBlocksGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmExtraCodeBlocksGenerator.cxx,v
retrieving revision 1.33
retrieving revision 1.34
diff -C 2 -d -r1.33 -r1.34
*** cmExtraCodeBlocksGenerator.cxx	13 Oct 2009 17:35:24 -0000	1.33
--- cmExtraCodeBlocksGenerator.cxx	20 Oct 2009 21:14:12 -0000	1.34
***************
*** 353,358 ****
              if (ti->first == "edit_cache")
                {
!               if (strstr(makefile->GetRequiredDefinition
!                                        ("CMAKE_EDIT_COMMAND"), "ccmake")!=NULL)
                  {
                  insertTarget = false;
--- 353,363 ----
              if (ti->first == "edit_cache")
                {
!               const char* editCommand = makefile->GetDefinition
!                                                         ("CMAKE_EDIT_COMMAND");
!               if (editCommand == 0)
!                 {
!                 insertTarget = false;
!                 }
!               else if (strstr(editCommand, "ccmake")!=NULL)
                  {
                  insertTarget = false;

Index: cmExtraEclipseCDT4Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmExtraEclipseCDT4Generator.cxx,v
retrieving revision 1.28
retrieving revision 1.29
diff -C 2 -d -r1.28 -r1.29
*** cmExtraEclipseCDT4Generator.cxx	28 Sep 2009 15:42:27 -0000	1.28
--- cmExtraEclipseCDT4Generator.cxx	20 Oct 2009 21:14:12 -0000	1.29
***************
*** 728,733 ****
             if (ti->first == "edit_cache")
               {
!              if (strstr(makefile->GetRequiredDefinition
!                                     ("CMAKE_EDIT_COMMAND"), "ccmake")!=NULL)
                 {
                 insertTarget = false;
--- 728,738 ----
             if (ti->first == "edit_cache")
               {
!              const char* editCommand = makefile->GetDefinition
!                                                         ("CMAKE_EDIT_COMMAND");
!              if (editCommand == 0)
!                {
!                insertTarget = false;
!                }
!              else if (strstr(editCommand, "ccmake")!=NULL)
                 {
                 insertTarget = false;