From 539d742caa8a9b9f86901fa9db5bd346ea4ae163 Mon Sep 17 00:00:00 2001 From: Bryan Hunt Date: Mon, 18 Jan 2021 22:28:48 -0700 Subject: [PATCH] Conda generator includes arch --- python/setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/python/setup.py b/python/setup.py index 457d15eba..21354182e 100644 --- a/python/setup.py +++ b/python/setup.py @@ -157,10 +157,11 @@ def build_extension(self, ext): if 'win32' == sys.platform: cmake_args += ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_%s=' % cfg.upper() + extdir, '-DCMAKE_RUNTIME_OUTPUT_DIRECTORY_%s=' % cfg.upper() + extdir] - if sys.maxsize > 2**32: - cmake_args += ['-A', 'x64'] if cmake_gen is not None: cmake_args += ['-G', cmake_gen] + elif sys.maxsize > 2**32: + cmake_args += ['-A', 'x64'] + else: cmake_args += ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir]