Skip to content

Fix Windows build errors #29

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

Closed
wants to merge 31 commits into from
Closed

Fix Windows build errors #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
1a34aa1
Remove python 3.9
kratman Feb 12, 2025
0fb6794
Revert version change
kratman Feb 12, 2025
d31942c
Update vcpkg version
kratman Feb 12, 2025
6612dd3
Use default parallelization
kratman Feb 12, 2025
aff8fb7
Merge branch 'main' into feat/windowsBuild
kratman Feb 13, 2025
9a99dfa
Merge branch 'main' of github.com:pybamm-team/pybammsolvers into feat…
kratman Feb 16, 2025
c01ad58
Merge branch 'feat/windowsBuild' of github.com:pybamm-team/pybammsolv…
kratman Feb 16, 2025
1d5931f
Change case
kratman Feb 16, 2025
b14aa00
Set build type as environment variable
kratman Feb 16, 2025
a75d20d
Add a triplet file
kratman Feb 16, 2025
bbfd65a
Switch commit
kratman Feb 17, 2025
54f74c7
Fix commit
kratman Feb 17, 2025
35e4088
Re-trigger
kratman Feb 17, 2025
10f2412
Update commit again
kratman Feb 17, 2025
a403dcb
Update commit again
kratman Feb 17, 2025
d3be903
Update commit again
kratman Feb 17, 2025
684a684
Merge branch 'main' into feat/windowsBuild
kratman Apr 25, 2025
971d3b3
Quick sanity check
kratman Apr 25, 2025
80c7365
Fix some builds
kratman Apr 25, 2025
23b3535
Merge branch 'main' into feat/windowsBuild
kratman Apr 25, 2025
5e45c24
Merge branch 'main' into feat/windowsBuild
kratman Apr 25, 2025
a5a3bdb
Revert CasADi, update Sundials
kratman Apr 28, 2025
6471f57
put casadi back
kratman Apr 28, 2025
8550531
Second attempt
kratman Apr 28, 2025
a3729a1
Try fix patch file
kratman Apr 28, 2025
75e42fa
Revert some changes
kratman Apr 28, 2025
1140148
Fix typo
kratman Apr 28, 2025
f426d3b
put change back
kratman Apr 28, 2025
edd67e6
Apply suggestions from code review
kratman Apr 30, 2025
d73699e
Merge branch 'main' of github.com:pybamm-team/pybammsolvers into feat…
kratman May 6, 2025
9ea6bbf
Merge branch 'feat/windowsBuild' of github.com:pybamm-team/pybammsolv…
kratman May 6, 2025
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: 1 addition & 1 deletion .github/workflows/build_wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
CIBW_ENVIRONMENT: >
PYBAMMSOLVERS_USE_VCPKG=ON
VCPKG_ROOT_DIR=C:\vcpkg
VCPKG_DEFAULT_TRIPLET=x64-windows-static-md
VCPKG_DEFAULT_TRIPLET=x64-windows-release
VCPKG_FEATURE_FLAGS=manifests,registries
CMAKE_GENERATOR="Visual Studio 17 2022"
CMAKE_GENERATOR_PLATFORM=x64
Expand Down
8 changes: 4 additions & 4 deletions vcpkg-configuration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
{
"kind": "git",
"repository": "https://github.com/pybamm-team/sundials-vcpkg-registry.git",
"baseline": "13d432fcf5da8591bb6cb2d46be9d6acf39cd02b",
"reference": "13d432fcf5da8591bb6cb2d46be9d6acf39cd02b",
"baseline": "5aa082a28ddca7052bd865ba8ef4e6c207a25955",
"reference": "5aa082a28ddca7052bd865ba8ef4e6c207a25955",
"packages": ["sundials"]
},
{
"kind": "git",
"repository": "https://github.com/pybamm-team/casadi-vcpkg-registry.git",
"baseline": "e4b797736790af90de505e0296b07e87719cb1a6",
"reference": "e4b797736790af90de505e0296b07e87719cb1a6",
"baseline": "33394a058d32d8ad5c6f7afbeb1a2a770a23b19d",
"reference": "33394a058d32d8ad5c6f7afbeb1a2a770a23b19d",
"packages": ["casadi"]
}
]
Expand Down
4 changes: 4 additions & 0 deletions x64-windows-release.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
set(VCPKG_TARGET_ARCHITECTURE x64)
set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE static)
set(VCPKG_BUILD_TYPE release)
Loading