[Cmake-commits] [cmake-commits] king committed CompileFlags.cmake 1.5 1.6

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake
In directory public:/mounts/ram/cvs-serv7372

Modified Files:
	CompileFlags.cmake 
Log Message:
Re-disable MSVC CRT deprecation warnings

The commit "Disable Intel CRT deprecation warnings" broke the logic that
disabled MS's CRT deprecation warnings.  This fixes the logic to disable
the warnings for both MSVC and Intel.


Index: CompileFlags.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/CompileFlags.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** CompileFlags.cmake	27 Oct 2009 16:11:08 -0000	1.5
--- CompileFlags.cmake	28 Oct 2009 12:42:20 -0000	1.6
***************
*** 22,31 ****
  INCLUDE (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake)
  
  # Disable deprecation warnings for standard C functions.
  # really only needed for newer versions of VS, but should
  # not hurt other versions, and this will work into the 
  # future
! IF(MSVC OR WIN32 AND "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$")
    ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
  ENDIF()
  
--- 22,36 ----
  INCLUDE (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake)
  
+ IF(WIN32 AND "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$")
+   SET(_INTEL_WINDOWS 1)
+ ENDIF()
+ 
  # Disable deprecation warnings for standard C functions.
  # really only needed for newer versions of VS, but should
  # not hurt other versions, and this will work into the 
  # future
! IF(MSVC OR _INTEL_WINDOWS)
    ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
+ ELSE()
  ENDIF()