Skip to content

Commit 2de613d

Browse files
committed
Update configuration for conan 2
Implements: ECDC-4551
1 parent e091765 commit 2de613d

File tree

5 files changed

+3
-177
lines changed

5 files changed

+3
-177
lines changed

.conanignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
LICENSE
2+
README.md

README.md

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,3 @@ conan config install http://github.com/ess-dmsc/conan-configuration.git
99
```
1010

1111
**Beware, installing this configuration will delete any other other remotes you may have configured.**
12-
13-
This is not necessary for conan2, but the packages are built with conan recipes in v1 format, and so `pip install conan<2` (or similar) must be used
14-
15-
The important things done by installing this configuration are:
16-
- setting the remotes to the ones we use in our projects
17-
- adding the compiler.libc setting for gcc and clang, so that packages can be built against glibc or musl, this is useful for builds on Alpine Linux where musl is used.
18-
19-
Conan2 uses remotes.json and completely ignores remotes.txt, as per https://docs.conan.io/1/migrating_to_2.0/config_files.html#remotes-txt and conan v1 will already use this if present
20-
21-
If you update `settings.yml` using one automatically generated by Conan then make sure you retain this change:
22-
```yml
23-
compiler:
24-
...
25-
gcc:
26-
...
27-
libc: [None, glibc, musl]
28-
clang:
29-
..
30-
libc: [None, glibc, musl]
31-
```

remotes.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"remotes": [
33
{
44
"name": "conancenter",
5-
"url": "https://center.conan.io",
5+
"url": "https://center2.conan.io",
66
"verify_ssl": true
77
},
88
{

remotes.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

settings.yml

Lines changed: 0 additions & 154 deletions
This file was deleted.

0 commit comments

Comments
 (0)