Ver Fonte

Can not use cmakedefine in kwsys because bootstrap of cmake does not support it.

Bill Hoffman há 16 anos atrás
pai
commit
472966ed5f
2 ficheiros alterados com 12 adições e 2 exclusões
  1. 6 1
      Source/kwsys/CMakeLists.txt
  2. 6 1
      Source/kwsys/Configure.hxx.in

+ 6 - 1
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)

+ 6 - 1
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@