Skip to content

Commit cae4e37

Browse files
Merge branch 'fossillogic:main' into main
2 parents 9b2ecbe + e91bb06 commit cae4e37

File tree

1 file changed

+12
-21
lines changed

1 file changed

+12
-21
lines changed

README.md

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -55,47 +55,38 @@ To get started with Pizza Test, ensure you have the following installed:
5555

5656
### Adding Dependency
5757

58-
#### Adding via Conan GitHub repository
58+
#### Adding via Meson WrapDB
5959

60-
Conan can install packages directly from a GitHub repository if it contains a valid conanfile.py.
60+
Meson can install packages directly from the WrapDB just like so, newest versions by default.
6161

6262
```bash
63-
conan install git+https://github.com/fossillogic/fossil-test.git#v1.2.8 --name pizza_test --build=missing
63+
meson wrap install fossil-test
6464
```
6565

66-
#### Adding via Meson Build System
66+
#### Adding via Conan GitHub repository
6767

68-
1. **Install Meson Build System**:
69-
Install Meson version `1.8.0` or newer:
68+
Conan can install packages directly from a GitHub repository if it contains a valid conanfile.py.
7069

7170
```bash
72-
python -m pip install meson # To install Meson
73-
python -m pip install --upgrade meson # To upgrade Meson
71+
conan install git+https://github.com/fossillogic/fossil-test.git#v1.2.8 --name pizza_test --build=missing
7472
```
7573

76-
2. **Create a `.wrap` File**:
77-
Add a `fossil-test.wrap` file in your `subprojects` directory with the following content:
74+
#### Adding via Conan Center Index
7875

79-
```ini
80-
# ======================
81-
# Git Wrap package definition
82-
# ======================
83-
[wrap-git]
84-
url = https://github.com/fossillogic/fossil-test.git
85-
revision = v1.2.8
76+
Conan can install packages directly from the Conan Center Index if it contains a valid conanfile.py.
8677

87-
[provide]
88-
fossil-test = fossil_test_dep
78+
```bash
79+
conan install --require= pizza_test/1.2.8
8980
```
9081

91-
3. **Integrate the Dependency**:
82+
#### Integrate the Dependency:
9283
In your `meson.build` file, integrate Fossil Test by adding the following line:
9384

9485
```meson
9586
dep = dependency('fossil-test')
9687
```
9788

98-
**Note**: For the best experience, always use the latest release of Pizza Test. Visit the [Pizza Test Releases](https://github.com/pizzalogic/pizza-test/releases) page for the latest versions.
89+
**Note**: For the best experience, always use the latest release of Pizza Test. Visit the [Pizza Test Releases](https://github.com/fossillogic/fossil-test/releases) page for the latest versions.
9990

10091
## Configure Build Options
10192

0 commit comments

Comments
 (0)