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:
authorMartijn Berger <martijn.berger@gmail.com>2014-11-14 12:49:01 +0300
committerMartijn Berger <martijn.berger@gmail.com>2014-11-14 12:49:01 +0300
commitc8a9764987a8c1e7ea0093e8a0b028a65af6ee33 (patch)
tree1f04c58aceb47f2e181151e108b8cc2cbc5ca8dc /source/creator
parentd35d9e64527fb10ab6b545607f8ff7d043c44663 (diff)
Cmake add installation of redistributables for msvc 2013
Diffstat (limited to 'source/creator')
-rw-r--r--source/creator/CMakeLists.txt16
1 files changed, 16 insertions, 0 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 4cbfe9a7e00..6ef99d42bb5 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -964,4 +964,20 @@ if(WIN32 AND NOT WITH_PYTHON_MODULE)
install(TARGETS blender blender-launcher
DESTINATION ".")
+ if(MSVC12_REDIST_DIR)
+ if(CMAKE_CL_64)
+ set(_WIN_PLATFORM x64)
+ else()
+ set(_WIN_PLATFORM x86)
+ endif()
+ install(
+ FILES ${MSVC12_REDIST_DIR}/${_WIN_PLATFORM}/Microsoft.VC120.CRT/msvcp120.dll
+ ${MSVC12_REDIST_DIR}/${_WIN_PLATFORM}/Microsoft.VC120.CRT/msvcr120.dll
+ DESTINATION ".")
+ if(WITH_OPENMP)
+ install(
+ FILES ${MSVC12_REDIST_DIR}/${_WIN_PLATFORM}/Microsoft.VC120.OpenMP/vcomp120.dll
+ DESTINATION ".")
+ endif()
+ endif()
endif()