diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-11-19 18:28:39 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-11-19 18:28:39 +0300 |
| commit | 559bd7576602e04b1895481561b054e67982351c (patch) | |
| tree | c17c92da080ff2336a340ecb86cb157272f04c55 /build_files | |
| parent | 5cbc7b6ed29645d793e813fab374add4e11fa4c7 (diff) | |
| parent | 369872a2c50e95eee822512018cc282ef5fcfdd1 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/platform/platform_win32_msvc.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake b/build_files/cmake/platform/platform_win32_msvc.cmake index 5efda52b2c5..6ca0568b5fd 100644 --- a/build_files/cmake/platform/platform_win32_msvc.cmake +++ b/build_files/cmake/platform/platform_win32_msvc.cmake @@ -129,8 +129,10 @@ if(NOT DEFINED LIBDIR) message(STATUS "32 bit compiler detected.") set(LIBDIR_BASE "windows") endif() - - if(MSVC_VERSION EQUAL 1900) + if(MSVC_VERSION EQUAL 1910) + message(STATUS "Visual Studio 2017 detected.") + set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc14) + elseif(MSVC_VERSION EQUAL 1900) message(STATUS "Visual Studio 2015 detected.") set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc14) else() |