Conda generator includes arch

manmuqingshan · Jan 19, 2021 · 539d742 · 539d742
1 parent 0a2b307
commit 539d742
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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]