[Cmake-commits] CMake branch, next, updated. v2.8.6-1793-g8505e68

David Cole david.cole at kitware.com
Fri Nov 4 13:25:19 EDT 2011


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  8505e682ed32155595e2ed4a039dcd97c49ec85b (commit)
       via  a2e6d2482e4eb007c8012f2aee3b2381cc95a001 (commit)
      from  d300da7498f18095e587942b67f9cc33408e9722 (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=8505e682ed32155595e2ed4a039dcd97c49ec85b
commit 8505e682ed32155595e2ed4a039dcd97c49ec85b
Merge: d300da7 a2e6d24
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Nov 4 13:25:01 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 4 13:25:01 2011 -0400

    Merge topic 'fix-11213-vs10-mfc-support' into next
    
    a2e6d24 Tests: Fix MFC test to work with VS 10 and later (#11213)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2e6d2482e4eb007c8012f2aee3b2381cc95a001
commit a2e6d2482e4eb007c8012f2aee3b2381cc95a001
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Nov 4 13:07:38 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Nov 4 13:07:38 2011 -0400

    Tests: Fix MFC test to work with VS 10 and later (#11213)
    
    The mfc app in the test was generated by the VS 7.1 wizard,
    and due to changes in VS since then, the values used for WINVER
    and _WIN32_WINNT caused compile errors when built with VS 10
    or later. Change them to values appropriate for targeting
    Windows XP or later when building with VS 10 or later.
    
    See http://msdn.microsoft.com/en-us/library/6sehtctf.aspx
    for more info.

diff --git a/Tests/MFC/mfc1/stdafx.h b/Tests/MFC/mfc1/stdafx.h
index fb9dfb3..35a678d 100644
--- a/Tests/MFC/mfc1/stdafx.h
+++ b/Tests/MFC/mfc1/stdafx.h
@@ -8,23 +8,38 @@
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
 #endif
 
+// See http://msdn.microsoft.com/en-us/library/6sehtctf.aspx for more info
+// on WINVER and _WIN32_WINNT
+
 // Modify the following defines if you have to target a platform prior to the ones specified below.
 // Refer to MSDN for the latest info on corresponding values for different platforms.
 #ifndef WINVER				// Allow use of features specific to Windows 95 and Windows NT 4 or later.
+#if _MSC_VER < 1600
 #define WINVER 0x0400		// Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
+#else
+#define WINVER 0x0501		// Target Windows XP and later with VS 10 and later
+#endif
 #endif
 
 #ifndef _WIN32_WINNT		// Allow use of features specific to Windows NT 4 or later.
+#if _MSC_VER < 1600
 #define _WIN32_WINNT 0x0400		// Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
+#else
+#define _WIN32_WINNT 0x0501		// Target Windows XP and later with VS 10 and later
+#endif
 #endif
 
 #ifndef _WIN32_WINDOWS		// Allow use of features specific to Windows 98 or later.
+#if _MSC_VER < 1600
 #define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
 #endif
+#endif
 
 #ifndef _WIN32_IE			// Allow use of features specific to IE 4.0 or later.
+#if _MSC_VER < 1600
 #define _WIN32_IE 0x0400	// Change this to the appropriate value to target IE 5.0 or later.
 #endif
+#endif
 
 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit
 

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

Summary of changes:
 Tests/MFC/mfc1/stdafx.h |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list