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

Improve vcpkg configuration #2630

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Improve vcpkg configuration #2630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5dea169
Proper vcpkg configuration
JasonMarechal25 Feb 10, 2025
5e345eb
Merge branch 'develop' into feature/vcpkg
JasonMarechal25 Feb 10, 2025
97e69dc
Merge branch 'develop' into feature/vcpkg
JasonMarechal25 Feb 12, 2025
5852a87
Use sirius 1.7
JasonMarechal25 Feb 12, 2025
3258bbc
Remove extra registry
JasonMarechal25 Feb 12, 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
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 @@ _build*
# pytest
__pycache__
venv/
vcpkg_installed
21 changes: 0 additions & 21 deletions src/ports/sirius-solver/portfile.cmake
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions src/ports/sirius-solver/vcpkg.json
View file
Open in desktop

This file was deleted.

20 changes: 20 additions & 0 deletions src/vcpkg-configuration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"overlay-triplets": [
"./triplets"
],
"default-registry": {
"kind": "git",
"baseline": "b322364f06308bdd24823f9d8f03fe0cc86fd46f",
"repository": "https://github.com/microsoft/vcpkg"
},
"registries": [
{
"kind": "git",
"repository": "https://github.com/AntaresSimulatorTeam/antares-vcpkg-registry",
"baseline": "db4099a569dd237a09e2f5afe9e1c52a44f5b55e",
"packages": [
"sirius-solver"
]
}
]
}
11 changes: 1 addition & 10 deletions src/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,10 @@
{
"name": "antares-simulator",
"version-string": "9.2.0",
"builtin-baseline": "b322364f06308bdd24823f9d8f03fe0cc86fd46f",
"vcpkg-configuration": {
"overlay-ports": [
"./ports"
],
"overlay-triplets": [
"./triplets"
]
},
"dependencies": [
{
"name": "sirius-solver",
"version>=": "1.5"
"version>=": "1.7"
},
{
"name": "wxwidgets",
Expand Down
Loading