From c8a9764987a8c1e7ea0093e8a0b028a65af6ee33 Mon Sep 17 00:00:00 2001
From: Martijn Berger <martijn.berger@gmail.com>
Date: Fri, 14 Nov 2014 10:49:01 +0100
Subject: Cmake add installation of redistributables for msvc 2013

---
 CMakeLists.txt                |  3 +++
 source/creator/CMakeLists.txt | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc4c9c53d62..7bc2560dd16 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1154,6 +1154,9 @@ elseif(WIN32)
 			endif()
 		endif()
 
+		set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
+		include(InstallRequiredSystemLibraries)
+
 		add_definitions(-DOIIO_STATIC_BUILD)
 
 		set(CMAKE_CXX_FLAGS "/nologo /J /Gd /EHsc /MP" CACHE STRING "MSVC MT C++ flags " FORCE)
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()
-- 
cgit v1.2.3