From 247702986a3e94bb2c74ac790904726851f90720 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 25 Feb 2014 09:56:55 +1100 Subject: [PATCH] CMake: add _WIN32_WINNT MSVC define to match scons --- CMakeLists.txt | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 39b441ea953..3e7ac95f985 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -973,11 +973,24 @@ elseif(WIN32) set(PLATFORM_LINKLIBS ${PLATFORM_LINKLIBS} dxguid) endif() - add_definitions(/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /D_CONSOLE /D_LIB) + add_definitions( + -D_CRT_NONSTDC_NO_DEPRECATE + -D_CRT_SECURE_NO_DEPRECATE + -D_SCL_SECURE_NO_DEPRECATE + -D_CONSOLE + -D_LIB + ) # MSVC11 needs _ALLOW_KEYWORD_MACROS to build - if(MSVC11 OR MSVC12) - add_definitions(/D_ALLOW_KEYWORD_MACROS) + if(NOT MSVC_VERSION VERSION_LESS 1700) + add_definitions(-D_ALLOW_KEYWORD_MACROS) + endif() + + if(CMAKE_CL_64) + # We want to support Vista level ABI for x64 + if(NOT MSVC_VERSION VERSION_LESS 1700) + add_definitions(-D_WIN32_WINNT=0x600) + endif() endif() set(CMAKE_CXX_FLAGS "/nologo /J /Gd /EHsc /MP" CACHE STRING "MSVC MT C++ flags " FORCE)