Skip to content

Commit

Permalink
macOS build script fixes
Browse files Browse the repository at this point in the history
Co-authored-by: Matt McCormick <[email protected]>
  • Loading branch information
2 people authored and jcfr committed Apr 2, 2019
1 parent 878aa26 commit 07eca87
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
3 changes: 2 additions & 1 deletion scripts/internal/macos_build_common.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
__all__ = ['DEFAULT_PY_ENVS', 'venv_paths']

from subprocess import check_call
from distutils import sysconfig
import os

DEFAULT_PY_ENVS = ["3.5", "3.6", "3.7"]
Expand Down Expand Up @@ -40,7 +41,7 @@ def venv_paths(python_version):
check_call([venv_executable, venv_dir])

python_executable = os.path.join(venv_dir, "bin", "python")
python_include_dir = "/Library/Frameworks/Python.framework/Versions/%s/include/python%sm" % (python_version, python_version)
python_include_dir = sysconfig.get_python_inc()

python_library = get_dummy_python_lib()

Expand Down
5 changes: 1 addition & 4 deletions scripts/macos_build_wheels.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ def build_wheel(python_version, cleanup=False):
"-r", os.path.join(ROOT_DIR, "requirements-dev.txt")])

build_type = 'Release'
source_path = "%s/%s-source" % (STANDALONE_DIR, PROJECT_NAME)
build_path = "%s/%s-osx_%s" % (ROOT_DIR, PROJECT_NAME, python_version)
osx_target="10.9"

Expand All @@ -72,10 +71,8 @@ def build_wheel(python_version, cleanup=False):
"setup.py", "bdist_wheel",
"--build-type", build_type,
"-G", "Ninja",
"--plat-name", "macosx-%s-x86_64" % osx_target,
"--",
"-DVTK_SOURCE_DIR:PATH=%s" % source_path,
"-DVTK_BINARY_DIR:PATH=%s" % build_path,
"-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=%s" % osx_target,
"-DPYTHON_EXECUTABLE:FILEPATH=%s" % py_exe,
"-DPYTHON_INCLUDE_DIR:PATH=%s" % py_inc_dir,
"-DPYTHON_LIBRARY:FILEPATH=%s" % py_lib
Expand Down

0 comments on commit 07eca87

Please sign in to comment.