diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-09-22 19:58:13 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-09-22 19:58:13 (GMT) |
| commit | 472966ed5f1cae85dd93431ebe5ebb8fee4c6d23 (patch) | |
| tree | 248be7a65160c356892862551b2b28eda28fc64f | |
| parent | e7601ca600ff6a183e85e0cc9408547adefd7e86 (diff) | |
| download | CMake-472966ed5f1cae85dd93431ebe5ebb8fee4c6d23.zip CMake-472966ed5f1cae85dd93431ebe5ebb8fee4c6d23.tar.gz CMake-472966ed5f1cae85dd93431ebe5ebb8fee4c6d23.tar.bz2 | |
Can not use cmakedefine in kwsys because bootstrap of cmake does not support it.
| -rw-r--r-- | Source/kwsys/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | Source/kwsys/Configure.hxx.in | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt index 07d54ca..34df847 100644 --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/CMakeLists.txt @@ -139,11 +139,16 @@ IF(COMMAND SET_PROPERTY) "KWSYS_HEADER(%)=<${KWSYS_NAMESPACE}/%>" ) 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) SET(KWSYS_USE_Directory 1) diff --git a/Source/kwsys/Configure.hxx.in b/Source/kwsys/Configure.hxx.in index 2f3fe34..f71d4d5 100644 --- a/Source/kwsys/Configure.hxx.in +++ b/Source/kwsys/Configure.hxx.in @@ -18,7 +18,12 @@ #include <@KWSYS_NAMESPACE@/Configure.h> /* Disable cleanup of putenv memory for issues with GCOV */ -#cmakedefine KWSYS_DO_NOT_CLEAN_PUTENV +#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. */ #define @KWSYS_NAMESPACE@_IOS_USE_ANSI @KWSYS_IOS_USE_ANSI@ |