Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Windows: compile xz with CMake #6947

Merged
merged 8 commits into from
Mar 29, 2023
Merged

Windows: compile xz with CMake #6947

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
407489a
windows: use CMake instead of MSBuild to compile liblzma
nulano Feb 12, 2023
abd2a3f
windows: compile dependencies with ninja instead of nmake
nulano Apr 12, 2020
57260d4
suppress MSVC compiler logo output when using ninja
nulano Feb 13, 2023
eeb7c7c
windows: parse build configuration with argparse
nulano Feb 13, 2023
c5e1b5a
use consistent capitalization
nulano Feb 13, 2023
91a53ed
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 13, 2023
f2527dd
Merge remote-tracking branch 'upstream/main' into winbuild-ninja
nulano Mar 1, 2023
1690592
correct minimum CMake version
nulano Mar 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use consistent capitalization 
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
  • Loading branch information
@nulano @hugovk
nulano and hugovk committed Feb 13, 2023
commit c5e1b5ad6694aa3b67277ee09a41d3408f645ddf
6 changes: 3 additions & 3 deletions winbuild/build.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ Run ``build_prepare.py`` to configure the build::
directory used to store cached dependencies (default:
'winbuild\depends')
--architecture {x86,x64,ARM64}
build architecture (default: same as host python)
--python PYTHON Python install directory (default: use host python)
build architecture (default: same as host Python)
--python PYTHON Python install directory (default: use host Python)
--executable EXECUTABLE
Python executable (default: use host python)
Python executable (default: use host Python)
--nmake build dependencies using NMake instead of Ninja
--no-imagequant skip GPL-licensed optional dependency libimagequant
--no-fribidi, --no-raqm
Expand Down
11 changes: 6 additions & 5 deletions winbuild/build_prepare.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,8 @@ def build_pillow():
dest="depends_dir",
metavar="PILLOW_DEPS",
default=os.environ.get("PILLOW_DEPS", os.path.join(winbuild_dir, "depends")),
help="directory used to store cached dependencies (default: 'winbuild\\depends')", # noqa: E501
help="directory used to store cached dependencies "
"(default: 'winbuild\\depends')",
)
parser.add_argument(
"--architecture",
Expand All @@ -616,21 +617,21 @@ def build_pillow():
else ("x86" if struct.calcsize("P") == 4 else "x64")
),
),
help="build architecture (default: same as host python)",
help="build architecture (default: same as host Python)",
)
parser.add_argument(
"--python",
dest="python_dir",
metavar="PYTHON",
default=os.environ.get("PYTHON"),
help="Python install directory (default: use host python)",
help="Python install directory (default: use host Python)",
)
parser.add_argument(
"--executable",
dest="python_exe",
metavar="EXECUTABLE",
default=os.environ.get("EXECUTABLE", "python.exe"),
help="Python executable (default: use host python)",
help="Python executable (default: use host Python)",
)
parser.add_argument(
"--nmake",
Expand All @@ -654,7 +655,7 @@ def build_pillow():
args = parser.parse_args()

arch_prefs = architectures[args.architecture]
print("Target Architecture:", args.architecture)
print("Target architecture:", args.architecture)

if args.python_dir is None:
args.python_dir = os.path.dirname(os.path.realpath(sys.executable))
Expand Down