[Cmake-commits] CMake branch, next, updated. v2.8.3-935-gf899660

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  f8996607bb9bca6e2bc441ad6ffcfe754b8a722e (commit)
       via  3fb088e521584dfed27513faf556b8b0d6cc73d3 (commit)
      from  e0c07c295ec983cdc8e27b8b323d83befcc4d98d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f8996607bb9bca6e2bc441ad6ffcfe754b8a722e
commit f8996607bb9bca6e2bc441ad6ffcfe754b8a722e
Merge: e0c07c2 3fb088e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 16 08:26:09 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 16 08:26:09 2010 -0500

    Merge topic 'intel-config-definitions' into next
    
    3fb088e Make Intel defines consistent with MSVC on Windows (#9904)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3fb088e521584dfed27513faf556b8b0d6cc73d3
commit 3fb088e521584dfed27513faf556b8b0d6cc73d3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 15 17:56:24 2010 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 15 17:56:24 2010 -0500

    Make Intel defines consistent with MSVC on Windows (#9904)
    
    Add /DWIN32 and /D_WINDOWS to default config-independent flags.
    Add /D[_N]DEBUG to default flags for each configuration.

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")

-----------------------------------------------------------------------

Summary of changes:
 Modules/Platform/Windows-icl.cmake |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake