mirror of
https://github.com/RetroShare/libretroshare.git
synced 2026-09-12 19:50:03 +05:00
ci: install rapidjson from the system
Build stopped on every file that includes rsjson.h:
rapidjson/document.h: No such file or directory
and the compile line carried no -I for it. CMakeLists.txt resolves rapidjson in
three steps: find_path in the system, then ../supportlibs/rapidjson, then
FetchContent. The third branch calls FetchContent_MakeAvailable(rapidjson) and
stops there -- it never adds an include directory for what it just downloaded,
so nothing reaches the compiler.
The super-project always takes the second branch, its submodule being present,
which is why this only shows up in a standalone build.
Installing the system package makes the first branch match, which is also what
the super-project's other CIs do: rapidjson-dev, mingw-w64-ucrt-x86_64-rapidjson,
rapidjson.
This commit is contained in:
parent
1b67abdf96
commit
5bcde96d2a
2
.github/workflows/macos-cmake.yml
vendored
2
.github/workflows/macos-cmake.yml
vendored
@ -50,7 +50,7 @@ jobs:
|
||||
brew install
|
||||
cmake ninja pkg-config
|
||||
openssl@3 botan@2 sqlcipher miniupnpc json-c
|
||||
bzip2 zlib doxygen gnu-sed
|
||||
bzip2 zlib doxygen gnu-sed rapidjson
|
||||
|
||||
# The restbed patch step of CMakeLists.txt runs `sed -i -e ...`, which is
|
||||
# GNU syntax: BSD sed reads the argument after -i as a backup suffix and
|
||||
|
||||
2
.github/workflows/ubuntu-cmake.yml
vendored
2
.github/workflows/ubuntu-cmake.yml
vendored
@ -52,7 +52,7 @@ jobs:
|
||||
sudo apt-get update &&
|
||||
sudo apt-get install -y
|
||||
build-essential g++ cmake ninja-build pkg-config git
|
||||
libssl-dev zlib1g-dev libbz2-dev libjson-c-dev libbotan-2-dev
|
||||
libssl-dev zlib1g-dev libbz2-dev libjson-c-dev libbotan-2-dev rapidjson-dev
|
||||
libsqlcipher-dev libminiupnpc-dev
|
||||
doxygen python3
|
||||
|
||||
|
||||
1
.github/workflows/windows-cmake.yml
vendored
1
.github/workflows/windows-cmake.yml
vendored
@ -61,6 +61,7 @@ jobs:
|
||||
mingw-w64-ucrt-x86_64-doxygen
|
||||
mingw-w64-ucrt-x86_64-openssl
|
||||
mingw-w64-ucrt-x86_64-libbotan
|
||||
mingw-w64-ucrt-x86_64-rapidjson
|
||||
mingw-w64-ucrt-x86_64-sqlcipher
|
||||
mingw-w64-ucrt-x86_64-miniupnpc
|
||||
mingw-w64-ucrt-x86_64-json-c
|
||||
|
||||
Loading…
Reference in New Issue
Block a user