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

Jump to bottom

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
correct minimum CMake version
  • Loading branch information
@nulano
nulano committed Mar 6, 2023
commit 1690592d8b514e4580384a6ca297540654a5f04b
2 changes: 1 addition & 1 deletion winbuild/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ For more extensive info, see the [Windows build instructions](build.rst).

* Requires Microsoft Visual Studio 2017 or newer with C++ component.
* Requires NASM for libjpeg-turbo, a required dependency when using this script.
* Requires CMake 3.13 or newer (available as Visual Studio component).
* Requires CMake 3.15 or newer (available as Visual Studio component).
* Tested on Windows Server 2016 with Visual Studio 2017 Community, and Windows Server 2019 with Visual Studio 2022 Community (AppVeyor).
* Tested on Windows Server 2022 with Visual Studio 2022 Enterprise (GitHub Actions).

Expand Down
2 changes: 1 addition & 1 deletion winbuild/build.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Download and install:
<https://visualstudio.microsoft.com/downloads/>`_
(MSVC C++ build tools, and any Windows SDK version required)

* `CMake 3.13 or newer <https://cmake.org/download/>`_
* `CMake 3.15 or newer <https://cmake.org/download/>`_
(also available as Visual Studio component C++ CMake tools for Windows)

* `Ninja <https://ninja-build.org/>`_
Expand Down