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.
This commit is contained in:
parent
e97fc32a63
commit
054b587504
|
@ -21,12 +21,17 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 6")
|
|||
ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 6")
|
||||
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 WIN32 AND "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$")
|
||||
IF(MSVC OR _INTEL_WINDOWS)
|
||||
ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
|
||||
ELSE()
|
||||
ENDIF()
|
||||
|
||||
#silence duplicate symbol warnings on AIX
|
||||
|
|
Loading…
Reference in New Issue