[Cmake-commits] CMake branch, master, updated. v2.8.2-4-g5c16024

KWSys Robot kwrobot at kitware.com
Tue Jun 29 08:50:04 EDT 2010


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  5c16024fbb3388f8345683263c584f5518fdfa55 (commit)
       via  d2222d529d957eef48078c617bdef213961276d8 (commit)
      from  198e00f6e8341da9804f69c0821222f2d999b3ef (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c16024fbb3388f8345683263c584f5518fdfa55
commit 5c16024fbb3388f8345683263c584f5518fdfa55
Author: Brad King <brad.king at kitware.com>
Date:   Tue Jun 29 08:45:33 2010 -0400

    KWSys: Pass ptrdiff_t check result to System.c
    
    Since commit "Provide unix-sytle command line parsing" (2009-07-13) the
    reference to KWSYS_C_HAS_PTRDIFF_T in System.c has been meaningless
    because the macro was never passed to the compiler!

diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt
index 5e725e4..083629a 100644
--- a/Source/kwsys/CMakeLists.txt
+++ b/Source/kwsys/CMakeLists.txt
@@ -601,6 +601,14 @@ ENDIF(KWSYS_BUILD_SHARED)
 #-----------------------------------------------------------------------------
 # Configure some implementation details.
 
+KWSYS_PLATFORM_C_TEST(KWSYS_C_HAS_PTRDIFF_T
+  "Checking whether C compiler has ptrdiff_t in stddef.h" DIRECT)
+KWSYS_PLATFORM_C_TEST(KWSYS_C_HAS_SSIZE_T
+  "Checking whether C compiler has ssize_t in unistd.h" DIRECT)
+SET_SOURCE_FILES_PROPERTIES(ProcessUNIX.c System.c PROPERTIES
+  COMPILE_FLAGS "-DKWSYS_C_HAS_PTRDIFF_T=${KWSYS_C_HAS_PTRDIFF_T} -DKWSYS_C_HAS_SSIZE_T=${KWSYS_C_HAS_SSIZE_T}"
+  )
+
 IF(KWSYS_DO_NOT_CLEAN_PUTENV)
   # Disable cleanup of putenv memory for issues with GCOV.
   SET_SOURCE_FILES_PROPERTIES(SystemTools.cxx PROPERTIES
@@ -785,15 +793,6 @@ IF(KWSYS_USE_Process)
   ELSE(NOT UNIX)
     # Use the UNIX implementation.
     SET(KWSYS_C_SRCS ${KWSYS_C_SRCS} ProcessUNIX.c)
-
-    # Help ProcessUNIX.c compile properly on all platforms.
-    KWSYS_PLATFORM_C_TEST(KWSYS_C_HAS_PTRDIFF_T
-      "Checking whether C compiler has ptrdiff_t in stddef.h" DIRECT)
-    KWSYS_PLATFORM_C_TEST(KWSYS_C_HAS_SSIZE_T
-      "Checking whether C compiler has ssize_t in unistd.h" DIRECT)
-    SET_SOURCE_FILES_PROPERTIES(ProcessUNIX.c PROPERTIES
-      COMPILE_FLAGS "-DKWSYS_C_HAS_PTRDIFF_T=${KWSYS_C_HAS_PTRDIFF_T} -DKWSYS_C_HAS_SSIZE_T=${KWSYS_C_HAS_SSIZE_T}"
-      )
   ENDIF(NOT UNIX)
 ENDIF(KWSYS_USE_Process)
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d2222d529d957eef48078c617bdef213961276d8
commit d2222d529d957eef48078c617bdef213961276d8
Author: Brad King <brad.king at kitware.com>
Date:   Tue Jun 29 08:44:33 2010 -0400

    KWSys: Cleanup putenv leak option implementation
    
    Define KWSYS_DO_NOT_CLEAN_PUTENV only for the implementation.  It does
    not need to be configured in the interface of "Configure.hxx".

diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt
index f440ff9..5e725e4 100644
--- a/Source/kwsys/CMakeLists.txt
+++ b/Source/kwsys/CMakeLists.txt
@@ -141,12 +141,6 @@ 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)
@@ -605,6 +599,15 @@ ELSE(KWSYS_BUILD_SHARED)
 ENDIF(KWSYS_BUILD_SHARED)
 
 #-----------------------------------------------------------------------------
+# Configure some implementation details.
+
+IF(KWSYS_DO_NOT_CLEAN_PUTENV)
+  # Disable cleanup of putenv memory for issues with GCOV.
+  SET_SOURCE_FILES_PROPERTIES(SystemTools.cxx PROPERTIES
+    COMPILE_FLAGS -DKWSYS_DO_NOT_CLEAN_PUTENV=1)
+ENDIF(KWSYS_DO_NOT_CLEAN_PUTENV)
+
+#-----------------------------------------------------------------------------
 # Choose a directory for the generated headers.
 IF(NOT KWSYS_HEADER_ROOT)
   SET(KWSYS_HEADER_ROOT "${PROJECT_BINARY_DIR}")
diff --git a/Source/kwsys/Configure.hxx.in b/Source/kwsys/Configure.hxx.in
index 9310d94..716b84f 100644
--- a/Source/kwsys/Configure.hxx.in
+++ b/Source/kwsys/Configure.hxx.in
@@ -15,15 +15,6 @@
 /* Include C configuration.  */
 #include <@KWSYS_NAMESPACE@/Configure.h>
 
-/* 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
-#endif
-
-
-
 /* Whether ANSI C++ stream headers are to be used.  */
 #define @KWSYS_NAMESPACE at _IOS_USE_ANSI @KWSYS_IOS_USE_ANSI@
 

-----------------------------------------------------------------------

Summary of changes:
 Source/kwsys/CMakeLists.txt   |   32 +++++++++++++++++---------------
 Source/kwsys/Configure.hxx.in |    9 ---------
 2 files changed, 17 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list