From 9bc5552ca256bd0d3b960670c0cf96b9b47cce1b Mon Sep 17 00:00:00 2001
From: Nikolaj Bjorner <nbjorner@microsoft.com>
Date: Thu, 25 Jun 2020 08:56:13 -0700
Subject: [PATCH] add vcrunime pattern to distribution directive #4542
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
---
scripts/mk_win_dist.py | 3 ++-
src/api/python/setup.py | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/scripts/mk_win_dist.py b/scripts/mk_win_dist.py
index acc711d1b..0b5226a64 100644
--- a/scripts/mk_win_dist.py
+++ b/scripts/mk_win_dist.py
@@ -253,7 +253,8 @@ def mk_zips():
VS_RUNTIME_PATS = [re.compile('vcomp.*\.dll'),
re.compile('msvcp.*\.dll'),
- re.compile('msvcr.*\.dll')]
+ re.compile('msvcr.*\.dll'),
+ re.compile('vcrun.*\.dll')]
# Copy Visual Studio Runtime libraries
def cp_vs_runtime(x64):
diff --git a/src/api/python/setup.py b/src/api/python/setup.py
index 3bb911cf1..66c12c58b 100644
--- a/src/api/python/setup.py
+++ b/src/api/python/setup.py
@@ -143,7 +143,10 @@ def _copy_bins():
os.mkdir(HEADERS_DIR)
shutil.copy(os.path.join(BUILD_DIR, LIBRARY_FILE), LIBS_DIR)
shutil.copy(os.path.join(BUILD_DIR, EXECUTABLE_FILE), BINS_DIR)
- for filepath in glob.glob(os.path.join(BUILD_DIR, "msvcp*")) + glob.glob(os.path.join(BUILD_DIR, "vcomp*")):
+ path1 = glob.glob(os.path.join(BUILD_DIR, "msvcp*"))
+ path2 = glob.glob(os.path.join(BUILD_DIR, "vcomp*"))
+ path3 = glob.glob(os.path.join(BUILD_DIR, "vcrun*"))
+ for filepath in path1 + path2 + path3:
shutil.copy(filepath, LIBS_DIR)
for header_dir in HEADER_DIRS: