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:49:22 +0300
commit7ad367d0231dd0d84aeb6d5404b82b29e524dbbf (patch)
tree0639549c522323680489ce373ff7f16d5f72ffeb /build_files/cmake
parent10f3b49026a5a6d9c1d3e53f429f3076eb6effdb (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')
-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 85974bc3788..2c5294d37ab 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -173,7 +173,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)