[llvm-branch-commits] [llvm-branch] r339323 - Merging r339319:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Aug  9 02:35:38 2018
New Revision: 339323

URL: http://llvm.org/viewvc/llvm-project?rev=339323&view=rev
Log:
Merging r339319:
------------------------------------------------------------------------
r339319 | hans | 2018-08-09 10:41:03 +0200 (Thu, 09 Aug 2018) | 1 line

cmake: don't pack system libs unless CMAKE_INSTALL_UCRT_LIBRARIES is set (PR38476)
------------------------------------------------------------------------

Modified:
    llvm/branches/release_70/   (props changed)
    llvm/branches/release_70/CMakeLists.txt

Propchange: llvm/branches/release_70/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug  9 02:35:38 2018
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,338552,338554,338569,338599,338610,338658,338665,338682,338703,338709,338716,338751,338762,338817,338902,338915,338968,339190
+/llvm/trunk:155241,338552,338554,338569,338599,338610,338658,338665,338682,338703,338709,338716,338751,338762,338817,338902,338915,338968,339190,339319

Modified: llvm/branches/release_70/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/CMakeLists.txt?rev=339323&r1=339322&r2=339323&view=diff
==============================================================================
--- llvm/branches/release_70/CMakeLists.txt (original)
+++ llvm/branches/release_70/CMakeLists.txt Thu Aug  9 02:35:38 2018
@@ -1037,6 +1037,6 @@ if(LLVM_DISTRIBUTION_COMPONENTS)
 endif()
 
 # This allows us to deploy the Universal CRT DLLs by passing -DCMAKE_INSTALL_UCRT_LIBRARIES=ON to CMake
-if (MSVC AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+if (MSVC AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_INSTALL_UCRT_LIBRARIES)
   include(InstallRequiredSystemLibraries)
 endif()