diff options
| author | David Cole <david.cole@kitware.com> | 2007-08-15 15:38:13 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2007-08-15 15:38:13 (GMT) |
| commit | f1115a30eecd4b6c9459c1526ec49b7a76394097 (patch) | |
| tree | 0bf58af416d4d8d84c88f5bc114cf3946beb41cc /Source/kwsys | |
| parent | 2f23ecdb8aa5bc1a86158df551f5649c439c7c52 (diff) | |
| download | CMake-f1115a30eecd4b6c9459c1526ec49b7a76394097.zip CMake-f1115a30eecd4b6c9459c1526ec49b7a76394097.tar.gz CMake-f1115a30eecd4b6c9459c1526ec49b7a76394097.tar.bz2 | |
COMP: Second try getting rid of Microsoft deprecation warnings. This time tested from KWStyle with vs8 to make sure the warnings are really gone. Remove the deprecation defs from CMakeLists and guard the defs in the header so we do not redefine them if they are already defined.
Diffstat (limited to 'Source/kwsys')
| -rw-r--r-- | Source/kwsys/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | Source/kwsys/Configure.h.in | 12 |
2 files changed, 9 insertions, 12 deletions
diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt index 4585f8a..5a65faa 100644 --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/CMakeLists.txt @@ -137,15 +137,6 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR) SET(KWSYS_USE_IOStream 1) ENDIF(KWSYS_STANDALONE OR CMake_SOURCE_DIR) -# Disable deprecation warnings for standard C and STL functions in -# VS2005 and later. -IF(KWSYS_STANDALONE) - IF(MSVC80) - ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE) - ADD_DEFINITIONS(-D_SCL_SECURE_NO_DEPRECATE) - ENDIF(MSVC80) -ENDIF(KWSYS_STANDALONE) - # Setup the large file support default. IF(KWSYS_LFS_DISABLE) SET(KWSYS_LFS_REQUESTED 0) diff --git a/Source/kwsys/Configure.h.in b/Source/kwsys/Configure.h.in index 92c84f6..b423499 100644 --- a/Source/kwsys/Configure.h.in +++ b/Source/kwsys/Configure.h.in @@ -25,9 +25,15 @@ /* If we are building a kwsys .c or .cxx file, suppress the Microsoft deprecation warnings. */ #if defined(KWSYS_NAMESPACE) -# define _CRT_SECURE_NO_DEPRECATE -# define _CRT_NONSTDC_NO_DEPRECATE -# define _SCL_SECURE_NO_DEPRECATE +# ifndef _CRT_NONSTDC_NO_DEPRECATE +# define _CRT_NONSTDC_NO_DEPRECATE +# endif +# ifndef _CRT_SECURE_NO_DEPRECATE +# define _CRT_SECURE_NO_DEPRECATE +# endif +# ifndef _SCL_SECURE_NO_DEPRECATE +# define _SCL_SECURE_NO_DEPRECATE +# endif #endif /* Whether Large File Support is requested. */ |