[Bf-blender-cvs] [c5803441f3c] gsoc-2018-many-light-sampling: make.bat : improve error message while detecting the msvc runtime when using clang
Ray Molenkamp
noreply at git.blender.org
Fri Jun 1 16:18:11 CEST 2018
Commit: c5803441f3c1efb7cb2f8403f4a5d418c2faa4dc
Author: Ray Molenkamp
Date: Mon May 28 20:07:24 2018 -0600
Branches: gsoc-2018-many-light-sampling
https://developer.blender.org/rBc5803441f3c1efb7cb2f8403f4a5d418c2faa4dc
make.bat : improve error message while detecting the msvc runtime when using clang
===================================================================
M build_files/cmake/platform/platform_win32.cmake
===================================================================
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 205040ac0cf..3c35851bc5f 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})
More information about the Bf-blender-cvs
mailing list