diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-05-29 05:07:51 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-05-29 05:07:51 +0300 |
| commit | 6946c413402c05a838e98a3823bf926df8cfe8d1 (patch) | |
| tree | 1319bfc5f0145659cd5fbf51df3268140aaab234 /build_files | |
| parent | 3ad9a94c9d0138e7358c1a1109d4870674de119f (diff) | |
| parent | d6a4b23f8bcbc3076e7d9f2a52c347670188949f (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 8980b7e0bea..c14f6013394 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -31,7 +31,12 @@ endif() if(CMAKE_C_COMPILER_ID MATCHES "Clang") set(MSVC_CLANG On) - file(TO_CMAKE_PATH $ENV{VCToolsRedistDir} MSVC_REDIST_DIR) + set(MSVC_REDIST_DIR $ENV{VCToolsRedistDir}) + if (DEFINED MSVC_REDIST_DIR) + file(TO_CMAKE_PATH ${MSVC_REDIST_DIR} MSVC_REDIST_DIR) + else() + message("Unable to detect the Visual Studio redist directory, copying of the runtime dlls will not work, try running from the visual studio developer prompt.") + endif() endif() set_property(GLOBAL PROPERTY USE_FOLDERS ${WINDOWS_USE_VISUAL_STUDIO_FOLDERS}) |