[Cmake-commits] [cmake-commits] hoffman committed Configure.hxx.in 1.23 1.24 SystemTools.cxx 1.249 1.250

[cmake-commits at cmake.org]

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

Modified Files:
	Configure.hxx.in SystemTools.cxx 
Log Message:
Put a flag in that will stop system tools from deleting system environment memory on exit, as it can cause gcov to crash the programs.


Index: Configure.hxx.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/Configure.hxx.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -C 2 -d -r1.23 -r1.24
*** Configure.hxx.in	31 Aug 2009 17:00:55 -0000	1.23
--- Configure.hxx.in	22 Sep 2009 18:56:33 -0000	1.24
***************
*** 18,21 ****
--- 18,24 ----
  #include <@KWSYS_NAMESPACE@/Configure.h>
  
+ /* Disable cleanup of putenv memory for issues with GCOV */
+ #cmakedefine KWSYS_DO_NOT_CLEAN_PUTENV
+ 
  /* Whether ANSI C++ stream headers are to be used.  */
  #define @KWSYS_NAMESPACE at _IOS_USE_ANSI @KWSYS_IOS_USE_ANSI@

Index: SystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemTools.cxx,v
retrieving revision 1.249
retrieving revision 1.250
diff -C 2 -d -r1.249 -r1.250
*** SystemTools.cxx	22 Sep 2009 17:02:19 -0000	1.249
--- SystemTools.cxx	22 Sep 2009 18:56:33 -0000	1.250
***************
*** 416,419 ****
--- 416,420 ----
  kwsysDeletingCharVector::~kwsysDeletingCharVector()
  {
+ #ifndef KWSYS_DO_NOT_CLEAN_PUTENV
    for(kwsys_stl::vector<char*>::iterator i = this->begin();
        i != this->end(); ++i)
***************
*** 421,424 ****
--- 422,426 ----
      delete []*i;
      }
+ #endif
  }
  bool SystemTools::PutEnv(const char* value)