From 008b4285f5a2ca9e4f63c26a57861e3a4ba32586 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 6 Dec 2017 11:35:14 -0800
Subject: [PATCH] don't use cmake sys library install, grab vcredist as
 external

---
 cmake/externals/vcredist/CMakeLists.txt | 21 +++++++++++++++++++++
 cmake/macros/GenerateInstallers.cmake   |  5 -----
 2 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 cmake/externals/vcredist/CMakeLists.txt

diff --git a/cmake/externals/vcredist/CMakeLists.txt b/cmake/externals/vcredist/CMakeLists.txt
new file mode 100644
index 0000000000..ac242cf451
--- /dev/null
+++ b/cmake/externals/vcredist/CMakeLists.txt
@@ -0,0 +1,21 @@
+if (WIN32)
+  set(EXTERNAL_NAME vcredist)
+  string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
+
+  include(ExternalProject)
+  ExternalProject_Add(
+    ${EXTERNAL_NAME}
+    URL https://go.microsoft.com/fwlink/?LinkId=746572
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND ""
+    LOG_DOWNLOAD 1
+  )
+
+  # Hide this external target (for ide users)
+  set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
+
+  ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
+
+  set(${EXTERNAL_NAME_UPPER}_PATH ${SOURCE_DIR} CACHE FILEPATH "Location of VC Redistributable")
+endif()
diff --git a/cmake/macros/GenerateInstallers.cmake b/cmake/macros/GenerateInstallers.cmake
index 6c131168d5..20ab32bf62 100644
--- a/cmake/macros/GenerateInstallers.cmake
+++ b/cmake/macros/GenerateInstallers.cmake
@@ -29,10 +29,6 @@ macro(GENERATE_INSTALLERS)
 
 
   if (WIN32)
-    # Do not install the Visual Studio C runtime libraries.  The installer will do this automatically
-    set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
-    
-    include(InstallRequiredSystemLibraries)
     set(CPACK_NSIS_MUI_ICON "${HF_CMAKE_DIR}/installer/installer.ico")
 
     # install and reference the Add/Remove icon
@@ -84,4 +80,3 @@ macro(GENERATE_INSTALLERS)
 
   include(CPack)
 endmacro()
-