diff options
| author | Brad King <brad.king@kitware.com> | 2010-12-21 18:58:29 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-12-21 18:58:29 (GMT) |
| commit | 92631c14d9dca43747636518d0e6aced20c72ef8 (patch) | |
| tree | b32504d6b9efaf410cd65e2a689cfe9abe071931 /Modules | |
| parent | 7a7a2cbd318b56eaf1708dfba0b7d42fb6f179a1 (diff) | |
| parent | 3fb088e521584dfed27513faf556b8b0d6cc73d3 (diff) | |
| download | CMake-92631c14d9dca43747636518d0e6aced20c72ef8.zip CMake-92631c14d9dca43747636518d0e6aced20c72ef8.tar.gz CMake-92631c14d9dca43747636518d0e6aced20c72ef8.tar.bz2 | |
Merge topic 'intel-config-definitions'
3fb088e Make Intel defines consistent with MSVC on Windows (#9904)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Windows-icl.cmake | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Modules/Platform/Windows-icl.cmake b/Modules/Platform/Windows-icl.cmake index 9088cc7..278a757 100644 --- a/Modules/Platform/Windows-icl.cmake +++ b/Modules/Platform/Windows-icl.cmake @@ -58,16 +58,16 @@ SET(CMAKE_CREATE_CONSOLE_EXE /subsystem:console) # default to Debug builds #SET(CMAKE_BUILD_TYPE_INIT Debug) SET(CMAKE_BUILD_TYPE_INIT Release) -SET (CMAKE_CXX_FLAGS_INIT "/W3 /Zm1000 /GX /GR") -SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/MDd /Zi /Od /GZ") -SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/MD /O1") -SET (CMAKE_CXX_FLAGS_RELEASE_INIT "/MD /O2") -SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2") -SET (CMAKE_C_FLAGS_INIT "/W3 /Zm1000") -SET (CMAKE_C_FLAGS_DEBUG_INIT "/MDd /Zi /Od /GZ") -SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "/MD /O1") -SET (CMAKE_C_FLAGS_RELEASE_INIT "/MD /O2") -SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2") +SET (CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /GX /GR") +SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Od /GZ") +SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/DNDEBUG /MD /O1") +SET (CMAKE_CXX_FLAGS_RELEASE_INIT "/DNDEBUG /MD /O2") +SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/DNDEBUG /MD /Zi /O2") +SET (CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000") +SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Od /GZ") +SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "/DNDEBUG /MD /O1") +SET (CMAKE_C_FLAGS_RELEASE_INIT "/DNDEBUG /MD /O2") +SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/DNDEBUG /MD /Zi /O2") SET(CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib") |