diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-10-28 16:17:18 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-10-28 16:17:18 (GMT) |
| commit | b4ae8bad4b8e7810a44e2f77363de3009260a473 (patch) | |
| tree | 7dd8a97d409c6339948ac4b3e0eda77cd9b7384e /CompileFlags.cmake | |
| parent | ebd0c2d3771835a1317c1fd70eafd3ebf2135b01 (diff) | |
| download | CMake-b4ae8bad4b8e7810a44e2f77363de3009260a473.zip CMake-b4ae8bad4b8e7810a44e2f77363de3009260a473.tar.gz CMake-b4ae8bad4b8e7810a44e2f77363de3009260a473.tar.bz2 | |
RC 4 merge
Diffstat (limited to 'CompileFlags.cmake')
| -rw-r--r-- | CompileFlags.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/CompileFlags.cmake b/CompileFlags.cmake index ed12ab2..3b455b9 100644 --- a/CompileFlags.cmake +++ b/CompileFlags.cmake @@ -21,13 +21,18 @@ 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) +IF(MSVC OR _INTEL_WINDOWS) ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE) -ENDIF(MSVC) +ELSE() +ENDIF() #silence duplicate symbol warnings on AIX IF(CMAKE_SYSTEM MATCHES "AIX.*") |