Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-02-25 02:56:55 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-02-25 02:56:55 +0400
commit247702986a3e94bb2c74ac790904726851f90720 (patch)
tree48ae925a8426b9e57ffd0062cf4695bfe6ab7ed1 /CMakeLists.txt
parent4903544cad4eb062db106cb13abd6b562a610b7c (diff)
CMake: add _WIN32_WINNT MSVC define to match scons
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt19
1 files 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)