[Bf-blender-cvs] [1a840c3e27a] master: Fix T53951: Copy ms runtime dlls using InstallRequiredSystemLibraries.cmake

[Ray Molenkamp]

Commit: 1a840c3e27a4a5b00412f786db14182e1d3a2255
Author: Ray Molenkamp
Date:   Thu Feb 1 08:26:14 2018 -0700
Branches: master
https://developer.blender.org/rB1a840c3e27a4a5b00412f786db14182e1d3a2255

Fix T53951: Copy ms runtime dlls using InstallRequiredSystemLibraries.cmake

Differential Revision: https://developer.blender.org/D3032

===================================================================

M	build_files/cmake/platform/platform_win32.cmake
M	source/creator/CMakeLists.txt

===================================================================

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")
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 2bda651f756..bcb0a7a7d1d 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -1024,70 +1024,4 @@ if(WIN32 AND NOT WITH_PYTHON_MODULE)
 		COMPONENT Blender
 		DESTINATION "."
 	)
-	if(CMAKE_CL_64)
-		set(_WIN_PLATFORM x64)
-	else()
-		set(_WIN_PLATFORM x86)
-	endif()
-	if(MSVC12_REDIST_DIR)
-		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()
-	
-	if(MSVC14_REDIST_DIR)
-		set(KITSDIRx86 "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/10/")
-		set(KITSDIR "$ENV{ProgramFiles}/Windows Kits/10/")
-		if(IS_DIRECTORY ${KITSDIR})
-			set(KITSPATH "${KITSDIR}/Redist/ucrt/DLLs/${_WIN_PLATFORM}")
-		else()
-			if(IS_DIRECTORY ${KITSDIRx86})
-				set(KITSPATH "${KITSDIRx86}/Redist/ucrt/DLLs/${_WIN_PLATFORM}")
-			else()
-				message(FATAL_ERROR "Windows 10 SDK directory not found")
-			endif()
-		endif()
-		FILE(TO_CMAKE_PATH  ${KITSPATH} KITSPATH)
-		install(
-			FILES
-				${KITSPATH}/api-ms-win-core-file-l1-2-0.dll
-				${KITSPATH}/api-ms-win-core-file-l2-1-0.dll
-				${KITSPATH}/api-ms-win-core-localization-l1-2-0.dll
-				${KITSPATH}/api-ms-win-core-processthreads-l1-1-0.dll
-				${KITSPATH}/api-ms-win-core-processthreads-l1-1-1.dll
-				${KITSPATH}/api-ms-win-core-synch-l1-1-0.dll
-				${KITSPATH}/api-ms-win-core-synch-l1-2-0.dll
-				${KITSPATH}/api-ms-win-core-timezone-l1-1-0.dll
-				${KITSPATH}/api-ms-win-crt-conio-l1-1-0.dll
-				${KITSPATH}/api-ms-win-crt-convert-l1-1-0.dll
-				${KITSPATH}/api-ms-win-crt-environment-l1-1-0.dll
-				${KITSPATH}/api-ms-win-crt-filesystem-l1-1-0.dll
-				${KITSPATH}/api-ms-win-crt-heap-l1-1-0.dll
-				${KITSPATH}/api-ms-win-crt-locale-l1-1-0.dll
-				${KITSPATH}/api-ms-win-crt-math-l1-1-0.dll
-				${KITSPATH}/api-ms-win-crt-process-l1-1-0.dll
-				${KITSPATH}/api-ms-win-crt-runtime-l1-1-0.dll
-				${KITSPATH}/api-ms-win-crt-stdio-l1-1-0.dll
-				${KITSPATH}/api-ms-win-crt-string-l1-1-0.dll
-				${KITSPATH}/api-ms-win-crt-time-l1-1-0.dll
-				${KITSPATH}/ucrtbase.dll
-				${MSVC14_REDIST_DIR}/${_WIN_PLATFORM}/Microsoft.VC140.CRT/vcruntime140.dll
-			DESTINATION "."
-		)
-		if(WITH_OPENMP)
-			install(
-				FILES ${MSVC14_REDIST_DIR}/${_WIN_PLATFORM}/Microsoft.VC140.OpenMP/vcomp140.dll
-				DESTINATION "."
-			)
-		endif()
-	endif()
 endif()