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:
authorRay Molenkamp <github@lazydodo.com>2019-02-23 06:49:22 +0300
committerRay Molenkamp <github@lazydodo.com>2019-02-23 06:54:27 +0300
commit1d2fc413c89d434f5d5e140cd01522e562c10ecd (patch)
treea049470989f1775a4b08ad06ce1521dd6de86047 /build_files/cmake/platform/platform_win32.cmake
parent633b77b0eedb494ae9ddce22ee36bfb3bf698a15 (diff)
make.bat: Preliminary Visual Studio 2019 support.
VS2019 is binary compatible with the existing vc14 libraries and no new libraries libs are required in svn. VS2019 support requires cmake 3.14. VS2019 is still in pre-release state, you are required to explicitly select the pre-release version by using: make full 2019pre
Diffstat (limited to 'build_files/cmake/platform/platform_win32.cmake')
-rw-r--r--build_files/cmake/platform/platform_win32.cmake5
1 files changed, 4 insertions, 1 deletions
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 5b738e06763..02c346e845b 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -170,7 +170,10 @@ if(NOT DEFINED LIBDIR)
set(LIBDIR_BASE "windows")
endif()
# Can be 1910..1912
- if(MSVC_VERSION GREATER 1909)
+ if(MSVC_VERSION GREATER 1919)
+ message(STATUS "Visual Studio 2019 detected.")
+ set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc14)
+ elseif(MSVC_VERSION GREATER 1909)
message(STATUS "Visual Studio 2017 detected.")
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc14)
elseif(MSVC_VERSION EQUAL 1900)