kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

This commit is contained in:
David Cole 2007-08-15 11:38:13 -04:00
parent 2f23ecdb8a
commit f1115a30ee
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/kwsys/CMakeLists.txt
View File

@ -137,15 +137,6 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
SET(KWSYS_USE_IOStream 1) SET(KWSYS_USE_IOStream 1)
ENDIF(KWSYS_STANDALONE OR CMake_SOURCE_DIR) 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. # Setup the large file support default.
IF(KWSYS_LFS_DISABLE) IF(KWSYS_LFS_DISABLE)
SET(KWSYS_LFS_REQUESTED 0) SET(KWSYS_LFS_REQUESTED 0)

8
Source/kwsys/Configure.h.in
View File

@ -25,10 +25,16 @@
/* If we are building a kwsys .c or .cxx file, suppress the Microsoft /* If we are building a kwsys .c or .cxx file, suppress the Microsoft
deprecation warnings. */ deprecation warnings. */
#if defined(KWSYS_NAMESPACE) #if defined(KWSYS_NAMESPACE)
# define _CRT_SECURE_NO_DEPRECATE # ifndef _CRT_NONSTDC_NO_DEPRECATE
# define _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 # define _SCL_SECURE_NO_DEPRECATE
# endif # endif
#endif
/* Whether Large File Support is requested. */ /* Whether Large File Support is requested. */
#define @KWSYS_NAMESPACE@_LFS_REQUESTED @KWSYS_LFS_REQUESTED@ #define @KWSYS_NAMESPACE@_LFS_REQUESTED @KWSYS_LFS_REQUESTED@