diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-02 06:15:29 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-02 06:15:29 +0300 |
| commit | c3eb22e2ab0f4f96d64d1de7969966efd5d45066 (patch) | |
| tree | d0472fa9bc46c4ed73fdd8c55e0e4a2616c3178f /build_files | |
| parent | 7003c8a143dea49a4e4ccc6b26283933d87f4a87 (diff) | |
| parent | 88e69806b977a6ec97c807f5e97db3bf68cff759 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 5 |
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 d59e9d70922..58c7a749bbd 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -107,7 +107,10 @@ add_definitions(-D_ALLOW_KEYWORD_MACROS) add_definitions(-D_WIN32_WINNT=0x600) # Make cmake find the msvc redistributables -set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE) +set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP FALSE) +set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE) +set(CMAKE_INSTALL_OPENMP_LIBRARIES ${WITH_OPENMP}) +set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION .) include(InstallRequiredSystemLibraries) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /nologo /J /Gd /MP /EHsc") |