[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.147 1.148 Configure.hxx.in 1.24 1.25

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt Configure.hxx.in 
Log Message:
Can not use cmakedefine in kwsys because bootstrap of cmake does not support it.


Index: Configure.hxx.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/Configure.hxx.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -C 2 -d -r1.24 -r1.25
*** Configure.hxx.in	22 Sep 2009 18:56:33 -0000	1.24
--- Configure.hxx.in	22 Sep 2009 19:58:13 -0000	1.25
***************
*** 19,23 ****
  
  /* Disable cleanup of putenv memory for issues with GCOV */
! #cmakedefine KWSYS_DO_NOT_CLEAN_PUTENV
  
  /* Whether ANSI C++ stream headers are to be used.  */
--- 19,28 ----
  
  /* Disable cleanup of putenv memory for issues with GCOV */
! #if @KWSYS_DO_NOT_CLEAN_PUTENV@
! #define KWSYS_DO_NOT_CLEAN_PUTENV 
! #else
! #undef KWSYS_DO_NOT_CLEAN_PUTENV
! #else
! 
  
  /* Whether ANSI C++ stream headers are to be used.  */

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/CMakeLists.txt,v
retrieving revision 1.147
retrieving revision 1.148
diff -C 2 -d -r1.147 -r1.148
*** CMakeLists.txt	31 Aug 2009 17:00:55 -0000	1.147
--- CMakeLists.txt	22 Sep 2009 19:58:10 -0000	1.148
***************
*** 140,148 ****
      )
  ENDIF(COMMAND SET_PROPERTY)
  
  # Select library components.
  IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
    SET(KWSYS_ENABLE_C 1)
- 
    # Enable all components.
    SET(KWSYS_USE_Base64 1)
--- 140,153 ----
      )
  ENDIF(COMMAND SET_PROPERTY)
+ # add option to disable memory cleanup at exit of putenv memory
+ IF(DEFINED KWSYS_DO_NOT_CLEAN_PUTENV)
+   SET(KWSYS_DO_NOT_CLEAN_PUTENV 1)
+ ELSE(DEFINED KWSYS_DO_NOT_CLEAN_PUTENV)
+   SET(KWSYS_DO_NOT_CLEAN_PUTENV 0)
+ ENDIF(DEFINED KWSYS_DO_NOT_CLEAN_PUTENV)
  
  # Select library components.
  IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
    SET(KWSYS_ENABLE_C 1)
    # Enable all components.
    SET(KWSYS_USE_Base64 1)