From 2de613d77a2cb10b6c42a5e6e0cc65a94c172991 Mon Sep 17 00:00:00 2001 From: Milosz Nowak Date: Tue, 18 Feb 2025 12:53:00 +0100 Subject: [PATCH] Update configuration for conan 2 Implements: ECDC-4551 --- .conanignore | 2 + README.md | 20 ------- remotes.json | 2 +- remotes.txt | 2 - settings.yml | 154 --------------------------------------------------- 5 files changed, 3 insertions(+), 177 deletions(-) create mode 100644 .conanignore delete mode 100644 remotes.txt delete mode 100644 settings.yml diff --git a/.conanignore b/.conanignore new file mode 100644 index 0000000..f0f644e --- /dev/null +++ b/.conanignore @@ -0,0 +1,2 @@ +LICENSE +README.md diff --git a/README.md b/README.md index 0e55a7d..eb10b98 100644 --- a/README.md +++ b/README.md @@ -9,23 +9,3 @@ conan config install http://github.com/ess-dmsc/conan-configuration.git ``` **Beware, installing this configuration will delete any other other remotes you may have configured.** - -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 - -The important things done by installing this configuration are: -- setting the remotes to the ones we use in our projects -- 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. - -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 - -If you update `settings.yml` using one automatically generated by Conan then make sure you retain this change: -```yml -compiler: - ... - gcc: - ... - libc: [None, glibc, musl] - clang: - .. - libc: [None, glibc, musl] -``` diff --git a/remotes.json b/remotes.json index e668d7f..9f618e3 100644 --- a/remotes.json +++ b/remotes.json @@ -2,7 +2,7 @@ "remotes": [ { "name": "conancenter", - "url": "https://center.conan.io", + "url": "https://center2.conan.io", "verify_ssl": true }, { diff --git a/remotes.txt b/remotes.txt deleted file mode 100644 index bb930db..0000000 --- a/remotes.txt +++ /dev/null @@ -1,2 +0,0 @@ - conancenter https://center.conan.io true - ecdc-conan-release https://artifactory.esss.lu.se/artifactory/api/conan/ecdc-conan-release true diff --git a/settings.yml b/settings.yml deleted file mode 100644 index 4fa9e80..0000000 --- a/settings.yml +++ /dev/null @@ -1,154 +0,0 @@ - -# Only for cross building, 'os_build/arch_build' is the system that runs Conan -os_build: [Windows, WindowsStore, Linux, Macos, FreeBSD, SunOS, AIX, VxWorks] -arch_build: [x86, x86_64, ppc32be, ppc32, ppc64le, ppc64, armv5el, armv5hf, armv6, armv7, armv7hf, armv7s, armv7k, armv8, armv8_32, armv8.3, sparc, sparcv9, mips, mips64, avr, s390, s390x, sh4le, e2k-v2, e2k-v3, e2k-v4, e2k-v5, e2k-v6, e2k-v7] - -# Only for building cross compilation tools, 'os_target/arch_target' is the system for -# which the tools generate code -os_target: [Windows, Linux, Macos, Android, iOS, watchOS, tvOS, FreeBSD, SunOS, AIX, Arduino, Neutrino] -arch_target: [x86, x86_64, ppc32be, ppc32, ppc64le, ppc64, armv5el, armv5hf, armv6, armv7, armv7hf, armv7s, armv7k, armv8, armv8_32, armv8.3, sparc, sparcv9, mips, mips64, avr, s390, s390x, asm.js, wasm, sh4le, e2k-v2, e2k-v3, e2k-v4, e2k-v5, e2k-v6, e2k-v7, xtensalx6, xtensalx106] - -# Rest of the settings are "host" settings: -# - For native building/cross building: Where the library/program will run. -# - For building cross compilation tools: Where the cross compiler will run. -os: - Windows: - subsystem: [None, cygwin, msys, msys2, wsl] - WindowsStore: - version: ["8.1", "10.0"] - WindowsCE: - platform: ANY - version: ["5.0", "6.0", "7.0", "8.0"] - Linux: - # Distinguish some distributions, so packages built on different - # distributions are not downloaded there. - distro: [None, "centos", "almalinux", "debian"] - iOS: - version: &ios_version - ["7.0", "7.1", "8.0", "8.1", "8.2", "8.3", "9.0", "9.1", "9.2", "9.3", "10.0", "10.1", "10.2", "10.3", - "11.0", "11.1", "11.2", "11.3", "11.4", "12.0", "12.1", "12.2", "12.3", "12.4", - "13.0", "13.1", "13.2", "13.3", "13.4", "13.5", "13.6", "13.7", - "14.0", "14.1", "14.2", "14.3", "14.4", "14.5", "14.6", "14.7", "14.8", - "15.0", "15.1", "15.2", "15.3", "15.4"] - sdk: [None, "iphoneos", "iphonesimulator"] - sdk_version: [None, "11.3", "11.4", "12.0", "12.1", "12.2", "12.4", - "13.0", "13.1", "13.2", "13.4", "13.5", "13.6", "13.7", - "14.0", "14.1", "14.2", "14.3", "14.4", "14.5", "15.0", "15.2", "15.4"] - watchOS: - version: ["4.0", "4.1", "4.2", "4.3", "5.0", "5.1", "5.2", "5.3", "6.0", "6.1", "6.2", - "7.0", "7.1", "7.2", "7.3", "7.4", "7.5", "7.6", "8.0", "8.1", "8.3", "8.4", "8.5"] - sdk: [None, "watchos", "watchsimulator"] - sdk_version: [None, "4.3", "5.0", "5.1", "5.2", "5.3", "6.0", "6.1", "6.2", - "7.0", "7.1", "7.2", "7.4", "8.0", "8.0.1", "8.3", "8.5"] - tvOS: - version: ["11.0", "11.1", "11.2", "11.3", "11.4", "12.0", "12.1", "12.2", "12.3", "12.4", - "13.0", "13.2", "13.3", "13.4", "14.0", "14.2", "14.3", "14.4", "14.5", "14.6", "14.7", - "15.0", "15.1", "15.2", "15.3", "15.4"] - sdk: [None, "appletvos", "appletvsimulator"] - sdk_version: [None, "11.3", "11.4", "12.0", "12.1", "12.2", "12.4", - "13.0", "13.1", "13.2", "13.4", "14.0", "14.2", "14.3", "14.5", "15.0", "15.2", "15.4"] - Macos: - version: [None, "10.6", "10.7", "10.8", "10.9", "10.10", "10.11", "10.12", "10.13", "10.14", "10.15", "11.0", "12.0", "13.0"] - sdk: [None, "macosx"] - sdk_version: [None, "10.13", "10.14", "10.15", "11.0", "11.1", "11.3", "12.0", "12.1", "12.3"] - subsystem: - None: - catalyst: - ios_version: *ios_version - Android: - api_level: ANY - FreeBSD: - SunOS: - AIX: - Arduino: - board: ANY - Emscripten: - Neutrino: - version: ["6.4", "6.5", "6.6", "7.0", "7.1"] - baremetal: - VxWorks: - version: ["7"] -arch: [x86, x86_64, ppc32be, ppc32, ppc64le, ppc64, armv4, armv4i, armv5el, armv5hf, armv6, armv7, armv7hf, armv7s, armv7k, armv8, armv8_32, armv8.3, sparc, sparcv9, mips, mips64, avr, s390, s390x, asm.js, wasm, sh4le, e2k-v2, e2k-v3, e2k-v4, e2k-v5, e2k-v6, e2k-v7, xtensalx6, xtensalx106] -compiler: - sun-cc: - version: ["5.10", "5.11", "5.12", "5.13", "5.14", "5.15"] - threads: [None, posix] - libcxx: [libCstd, libstdcxx, libstlport, libstdc++] - gcc: &gcc - version: ["4.1", "4.4", "4.5", "4.6", "4.7", "4.8", "4.9", - "5", "5.1", "5.2", "5.3", "5.4", "5.5", - "6", "6.1", "6.2", "6.3", "6.4", "6.5", - "7", "7.1", "7.2", "7.3", "7.4", "7.5", - "8", "8.1", "8.2", "8.3", "8.4", - "9", "9.1", "9.2", "9.3", - "10", "10.1", "10.2", "10.3", - "11", "11.1", "11.2", - "12"] - libcxx: [libstdc++, libstdc++11] - threads: [None, posix, win32] # Windows MinGW - exception: [None, dwarf2, sjlj, seh] # Windows MinGW - cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23] - Visual Studio: &visual_studio - runtime: [MD, MT, MTd, MDd] - version: ["8", "9", "10", "11", "12", "14", "15", "16", "17"] - toolset: [None, v90, v100, v110, v110_xp, v120, v120_xp, - v140, v140_xp, v140_clang_c2, LLVM-vs2012, LLVM-vs2012_xp, - LLVM-vs2013, LLVM-vs2013_xp, LLVM-vs2014, LLVM-vs2014_xp, - LLVM-vs2017, LLVM-vs2017_xp, v141, v141_xp, v141_clang_c2, v142, - llvm, ClangCL, v143] - cppstd: [None, 14, 17, 20, 23] - msvc: - version: [170, 180, 190, 191, 192, 193] - update: [None, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9] - runtime: [static, dynamic] - runtime_type: [Debug, Release] - cppstd: [98, 14, 17, 20, 23] - toolset: [None, v110_xp, v120_xp, v140_xp, v141_xp] - clang: - version: ["3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "4.0", - "5.0", "6.0", "7.0", "7.1", - "8", "9", "10", "11", "12", "13", "14", "15"] - libcxx: [None, libstdc++, libstdc++11, libc++, c++_shared, c++_static] - cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23] - runtime: [None, MD, MT, MTd, MDd, static, dynamic] - runtime_type: [None, Debug, Release] - apple-clang++: &apple_clang - version: ["5.0", "5.1", "6.0", "6.1", "7.0", "7.3", "8.0", "8.1", "9.0", "9.1", "10.0", "11.0", "12.0", "13", "13.0", "13.1", "16.0"] - libcxx: [libstdc++, libc++] - cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20] - intel: - version: ["11", "12", "13", "14", "15", "16", "17", "18", "19", "19.1"] - update: [None, ANY] - base: - gcc: - <<: *gcc - threads: [None] - exception: [None] - Visual Studio: - <<: *visual_studio - apple-clang: - <<: *apple_clang - intel-cc: - version: ["2021.1", "2021.2", "2021.3"] - update: [None, ANY] - mode: ["icx", "classic", "dpcpp"] - libcxx: [None, libstdc++, libstdc++11, libc++] - cppstd: [None, 98, gnu98, 03, gnu03, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23] - runtime: [None, static, dynamic] - runtime_type: [None, Debug, Release] - qcc: - version: ["4.4", "5.4", "8.3"] - libcxx: [cxx, gpp, cpp, cpp-ne, accp, acpp-ne, ecpp, ecpp-ne] - cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17] - mcst-lcc: - version: ["1.19", "1.20", "1.21", "1.22", "1.23", "1.24", "1.25"] - base: - gcc: - <<: *gcc - threads: [None] - exceptions: [None] - -build_type: [None, Debug, Release, RelWithDebInfo, MinSizeRel] - - -cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23] # Deprecated, use compiler.cppstd