Skip to content

Commit 30dbde8

Browse files
xuqianchengOzaq
authored andcommitted
Update builtin-baseline in vcpkg.json for installing libraries Pcre2 and libhura.
Also limit the version of library fmt and qt, since the newer versions and jupedsim are incompatible.
1 parent a52e450 commit 30dbde8

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ During the CMake invocation listed in the next section, add this to your invocat
217217

218218
```bash
219219
-DCMAKE_TOOLCHAIN_FILE=<PATH-TO-VCPKG-INSTALLATION>/scripts/buildsystems/vcpkg.cmake
220-
-DVCPKG_MANIFEST_DIR=<PATH-TO-SOURCE-FOLDER>/vcpkg.json
220+
-DVCPKG_MANIFEST_DIR=<PATH-TO-SOURCE-FOLDER>/vcpkg
221221
```
222222

223223
## Contributing to JuPedSim

vcpkg/vcpkg.json

+11-1
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,15 @@
6868
"version>=": "0.9.9.8#1"
6969
}
7070
],
71-
"builtin-baseline": "35443ee2753f46c52ac342fa6c9c48e9f5eb9105"
71+
"builtin-baseline": "a1737683a6f8ec5d8673890581c2a8c55838d411",
72+
"overrides": [
73+
{
74+
"name": "qt5",
75+
"version": "5.15.2"
76+
},
77+
{
78+
"name": "fmt",
79+
"version": "8.0.1"
80+
}
81+
]
7282
}

0 commit comments

Comments
 (0)