diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-02-01 18:26:14 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-02-01 18:26:14 +0300 |
| commit | 1a840c3e27a4a5b00412f786db14182e1d3a2255 (patch) | |
| tree | a9d776978bf72113319ffac039b113bde3d58ef5 /build_files | |
| parent | 7e928c3bbc5a0048a35ffe02a1244a2f04f46ca5 (diff) | |
Fix T53951: Copy ms runtime dlls using InstallRequiredSystemLibraries.cmake
Differential Revision: https://developer.blender.org/D3032
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 4b444e63ebd..a2fae22a963 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") |