[cmake-commits] david.cole committed CMakeLists.txt 1.125 1.126 Configure.h.in 1.11 1.12

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/kwsys
In directory public:/mounts/ram/cvs-serv18635/Source/kwsys

Modified Files:
	CMakeLists.txt Configure.h.in 
Log Message:
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.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/CMakeLists.txt,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- CMakeLists.txt	19 Apr 2007 16:11:56 -0000	1.125
+++ CMakeLists.txt	15 Aug 2007 15:38:13 -0000	1.126
@@ -137,15 +137,6 @@
   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)

Index: Configure.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/Configure.h.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Configure.h.in	15 Aug 2007 13:25:58 -0000	1.11
+++ Configure.h.in	15 Aug 2007 15:38:13 -0000	1.12
@@ -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.  */