Skip to content

chore: add Windows ARM support #169

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

Merged
henryiii merged 10 commits into from
Dec 17, 2022
Merged

chore: add Windows ARM support #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6f6d6cc
chore: add Windows ARM support
henryiii Dec 12, 2022
cb5d7b6
WIP: try scikit-build PR
henryiii Dec 15, 2022
36c04a7
Update build.yml
henryiii Dec 15, 2022
61546e3
fix: avoid strip when cross-compiling
henryiii Dec 15, 2022
7599d24
Update CMakeLists.txt
henryiii Dec 15, 2022
39584f9
fix: turn off testing when cross compiling
henryiii Dec 15, 2022
1632a6b
chore: reduce warnings
henryiii Dec 15, 2022
d1e01d6
Apply suggestions from code review
henryiii Dec 15, 2022
c7c6479
Update pyproject.toml
henryiii Dec 16, 2022
b458df5
Update pyproject.toml
henryiii Dec 17, 2022
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
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ jobs:
arch: "s390x"
- os: windows-2019
arch: "AMD64"
- os: windows-2022
arch: "ARM64"
- os: windows-2019
arch: "x86"
- os: macos-11
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,4 @@ docs/_build
# IDE junk
.idea/*
*.swp
*~
41 changes: 22 additions & 19 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,26 +120,29 @@ ExternalProject_add(build_ninja
set(ninja_executable ${Ninja_BINARY_DIR}/ninja${CMAKE_EXECUTABLE_SUFFIX})
set(NINJA_BUILD_LAST_STEP "build")

find_program(STRIP_EXECUTABLE strip)
if(STRIP_EXECUTABLE)
ExternalProject_Add_Step(build_ninja strip_executables
DEPENDEES ${NINJA_BUILD_LAST_STEP}
COMMENT "Stripping CMake executables"
COMMAND ${STRIP_EXECUTABLE} ${ninja_executable}
USES_TERMINAL 1
)
set(NINJA_BUILD_LAST_STEP "strip_executables")
endif()
# This should not be stripped or tested if cross-compiling on Windows
if(CMAKE_CROSS_COMPILE OR NOT DEFINED ENV{DIST_EXTRA_CONFIG})
find_program(STRIP_EXECUTABLE strip)
if(STRIP_EXECUTABLE)
ExternalProject_Add_Step(build_ninja strip_executables
DEPENDEES ${NINJA_BUILD_LAST_STEP}
COMMENT "Stripping CMake executables"
COMMAND ${STRIP_EXECUTABLE} ${ninja_executable}
USES_TERMINAL 1
)
set(NINJA_BUILD_LAST_STEP "strip_executables")
endif()

if(RUN_NINJA_TEST)
ExternalProject_Add_Step(build_ninja run_ninja_test_suite
DEPENDEES ${NINJA_BUILD_LAST_STEP}
COMMENT "Running Ninja test suite"
COMMAND ${Ninja_BINARY_DIR}/ninja_test${CMAKE_EXECUTABLE_SUFFIX}
WORKING_DIRECTORY ${Ninja_BINARY_DIR}
USES_TERMINAL 1
)
set(NINJA_BUILD_LAST_STEP "run_ninja_test_suite")
if(RUN_NINJA_TEST)
ExternalProject_Add_Step(build_ninja run_ninja_test_suite
DEPENDEES ${NINJA_BUILD_LAST_STEP}
COMMENT "Running Ninja test suite"
COMMAND ${Ninja_BINARY_DIR}/ninja_test${CMAKE_EXECUTABLE_SUFFIX}
WORKING_DIRECTORY ${Ninja_BINARY_DIR}
USES_TERMINAL 1
)
set(NINJA_BUILD_LAST_STEP "run_ninja_test_suite")
endif()
endif()

install(FILES ${Ninja_SOURCE_DIR}/misc/ninja_syntax.py DESTINATION src/ninja)
Expand Down
5 changes: 3 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[build-system]
requires = [
"setuptools>=42",
"scikit-build>=0.12",
"setuptools >=42",
"scikit-build",
]
build-backend = "setuptools.build_meta"

Expand All @@ -16,6 +16,7 @@ before-build = "pip install -r requirements-repair.txt"
repair-wheel-command = "python scripts/repair_wheel.py -w {dest_dir} {wheel}"
test-extras = "test"
test-command = "pytest {project}/tests"
test-skip = ["*-win_arm64", "*-macosx_universal2:arm64"]

[[tool.cibuildwheel.overrides]]
select = "*-manylinux_{x86_64,i686}"
Expand Down