Commit: 247702986a3e94bb2c74ac790904726851f90720
Author: Campbell Barton
Date: Tue Feb 25 09:56:55 2014 +1100
https://developer.blender.org/rB247702986a3e94bb2c74ac790904726851f90720
CMake: add _WIN32_WINNT MSVC define to match scons
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39b441e..3e7ac95 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)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
