ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-11-22 11:35:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(dependencies): export correct and namespaced deps versions

Browse Source
This commit is contained in:
Niq Dudfield
2025-07-16 10:57:46 +07:00
committed by Nicholas Dudfield
parent 849d447a20
commit 90bb986316
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/actions/xahau-ga-dependencies/action.yml vendored
View File

@@ -59,8 +59,8 @@ runs:
- name: Export custom recipes - name: Export custom recipes
shell: bash shell: bash
run: | run: |
conan export external/snappy snappy/1.1.9@ conan export external/snappy snappy/1.1.10@xahaud/stable
conan export external/soci soci/4.0.3@ conan export external/soci soci/4.0.3@xahaud/stable
- name: Install dependencies - name: Install dependencies
shell: bash shell: bash

4
BUILD.md
View File

@@ -117,14 +117,14 @@ can't build earlier Boost versions.
which allows you to statically link it with GCC, if you want. which allows you to statically link it with GCC, if you want.
``` ```
conan export external/snappy snappy/1.1.9@ conan export external/snappy snappy/1.1.10@xahaud/stable
``` ```
5. Export our [Conan recipe for SOCI](./external/soci). 5. Export our [Conan recipe for SOCI](./external/soci).
It patches their CMake to correctly import its dependencies. It patches their CMake to correctly import its dependencies.
``` ```
conan export external/soci soci/4.0.3@ conan export external/soci soci/4.0.3@xahaud/stable
``` ```
### Build and Test ### Build and Test

4
conanfile.py
View File

@@ -32,8 +32,8 @@ class Xrpl(ConanFile):
'nudb/2.0.8', 'nudb/2.0.8',
'openssl/1.1.1u', 'openssl/1.1.1u',
'protobuf/3.21.9', 'protobuf/3.21.9',
'snappy/1.1.10', 'snappy/1.1.10@xahaud/stable',
'soci/4.0.3', 'soci/4.0.3@xahaud/stable',
'sqlite3/3.42.0', 'sqlite3/3.42.0',
'zlib/1.2.13', 'zlib/1.2.13',
'wasmedge/0.11.2', 'wasmedge/0.11.2',

2
external/soci/conanfile.py vendored
View File

@@ -154,7 +154,7 @@ class SociConan(ConanFile):
self.cpp_info.components["soci_core"].set_property("cmake_target_name", "SOCI::soci_core{}".format(target_suffix)) self.cpp_info.components["soci_core"].set_property("cmake_target_name", "SOCI::soci_core{}".format(target_suffix))
self.cpp_info.components["soci_core"].libs = ["{}soci_core{}".format(lib_prefix, lib_suffix)] self.cpp_info.components["soci_core"].libs = ["{}soci_core{}".format(lib_prefix, lib_suffix)]
if self.options.with_boost: if self.options.with_boost:
self.cpp_info.components["soci_core"].requires.append("boost::boost") self.cpp_info.components["soci_core"].requires.append("boost::headers")
# soci_empty # soci_empty
if self.options.empty: if self.options.empty: