Skip to content

Commit

Permalink
Pass -A in CMake only if specified by an environment variable.
Browse files Browse the repository at this point in the history
  • Loading branch information
teo-tsirpanis committed Mar 1, 2024
1 parent 50aaed1 commit 05df556
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
# Allow to override TILEDB_FORCE_ALL_DEPS with environment variable
TILEDB_FORCE_ALL_DEPS = "TILEDB_FORCE_ALL_DEPS" in os.environ
TILEDB_DISABLE_SERIALIZATION = "TILEDB_DISABLE_SERIALIZATION" in os.environ
CMAKE_ARCHITECTURE = os.environ.get("CMAKE_ARCHITECTURE", None)
CMAKE_GENERATOR = os.environ.get("CMAKE_GENERATOR", None)

# Directory containing this file
Expand Down Expand Up @@ -240,7 +241,10 @@ def build_libtiledb(src_dir):
cmake_cmd.append("-DCMAKE_BUILD_TYPE={}".format(build_type))

if os.name == "nt":
cmake_cmd.extend(["-A", "x64", "-DMSVC_MP_FLAG=/MP4"])
cmake_cmd.extend(["-DMSVC_MP_FLAG=/MP4"])

if CMAKE_ARCHITECTURE:
cmake_cmd.extend(["-A", CMAKE_ARCHITECTURE])

if CMAKE_GENERATOR:
cmake_cmd.extend(["-G", CMAKE_GENERATOR])
Expand Down

0 comments on commit 05df556

Please sign in to comment.