From 5ed344ee0355c993f569ca70b5a9959c85dd5797 Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Fri, 21 Apr 2023 10:27:25 +1000 Subject: [PATCH] conan: migrate profiles to conan2 --- conan/profile/armv7-gcc-linux-release | 2 +- conan/profile/x86_64-afl-linux-release | 4 +--- conan/profile/x86_64-clang-linux-debug | 10 ++++------ conan/profile/x86_64-clang-linux-release | 13 ++++++------- conan/profile/x86_64-clang-linux-sanitizer | 4 +--- conan/profile/x86_64-gcc-linux-debug | 8 +++----- conan/profile/x86_64-gcc-linux-release | 4 +--- conan/profile/x86_64-gcc-mingw-release | 2 +- init.py | 5 ++--- 9 files changed, 20 insertions(+), 32 deletions(-) diff --git a/conan/profile/armv7-gcc-linux-release b/conan/profile/armv7-gcc-linux-release index 212f6ac..f5c2388 100644 --- a/conan/profile/armv7-gcc-linux-release +++ b/conan/profile/armv7-gcc-linux-release @@ -3,7 +3,7 @@ target_host=armv7a-unknown-linux-gnueabihf cc_compiler=gcc cxx_compiler=g++ -[env] +[buildenv] CONAN_CMAKE_FIND_ROOT_PATH=$toolchain CHOST=$target_host AR=$target_host-ar diff --git a/conan/profile/x86_64-afl-linux-release b/conan/profile/x86_64-afl-linux-release index 49a94db..2483713 100644 --- a/conan/profile/x86_64-afl-linux-release +++ b/conan/profile/x86_64-afl-linux-release @@ -10,9 +10,7 @@ build_type=Release [options] -[build_requires] - -[env] +[buildenv] CC=afl-clang CXX=afl-clang++ CFLAGS="-flto" diff --git a/conan/profile/x86_64-clang-linux-debug b/conan/profile/x86_64-clang-linux-debug index 00454f8..8974816 100644 --- a/conan/profile/x86_64-clang-linux-debug +++ b/conan/profile/x86_64-clang-linux-debug @@ -3,15 +3,13 @@ os=Linux arch=x86_64 compiler=clang -compiler.version=14 +compiler.version=15 compiler.libcxx=libc++ build_type=Debug [options] -[build_requires] - -[env] -CC=clang-14 -CXX=clang++-14 +[buildenv] +CC=clang-15 +CXX=clang++-15 diff --git a/conan/profile/x86_64-clang-linux-release b/conan/profile/x86_64-clang-linux-release index c27e31b..f430278 100644 --- a/conan/profile/x86_64-clang-linux-release +++ b/conan/profile/x86_64-clang-linux-release @@ -3,17 +3,16 @@ os=Linux arch=x86_64 compiler=clang -compiler.version=14 -compiler.libcxx=libc++ +compiler.version=15 +#compiler.libcxx=libc++ +compiler.libcxx=libstdc++11 build_type=Release [options] -[build_requires] - -[env] -CC=clang-14 -CXX=clang++-14 +[buildenv] +CC=clang-15 +CXX=clang++-15 CFLAGS="-flto" CXXFLAGS="-flto" diff --git a/conan/profile/x86_64-clang-linux-sanitizer b/conan/profile/x86_64-clang-linux-sanitizer index 0a29569..8e03e55 100644 --- a/conan/profile/x86_64-clang-linux-sanitizer +++ b/conan/profile/x86_64-clang-linux-sanitizer @@ -10,9 +10,7 @@ build_type=Release [options] -[build_requires] - -[env] +[buildenv] CC=clang-14 CXX=clang++-14 CXXFLAGS="-fsanitize=undefined -fsanitize=address -fsanitize=leak" diff --git a/conan/profile/x86_64-gcc-linux-debug b/conan/profile/x86_64-gcc-linux-debug index 18f06eb..68f96ab 100644 --- a/conan/profile/x86_64-gcc-linux-debug +++ b/conan/profile/x86_64-gcc-linux-debug @@ -10,9 +10,7 @@ build_type=Debug [options] -[build_requires] - -[env] -CC=gcc -CXX=g++ +[buildenv] +CC=gcc-12 +CXX=g++-12 CXXFLAGS=-D_GLIBCXX_DEBUG diff --git a/conan/profile/x86_64-gcc-linux-release b/conan/profile/x86_64-gcc-linux-release index 00400bd..d4b4737 100644 --- a/conan/profile/x86_64-gcc-linux-release +++ b/conan/profile/x86_64-gcc-linux-release @@ -10,9 +10,7 @@ build_type=Release [options] -[build_requires] - -[env] +[buildenv] CC=gcc CXX=g++ CXXFLAGS="-flto -ffat-lto-objects" diff --git a/conan/profile/x86_64-gcc-mingw-release b/conan/profile/x86_64-gcc-mingw-release index 9bcc2fe..2fc7485 100644 --- a/conan/profile/x86_64-gcc-mingw-release +++ b/conan/profile/x86_64-gcc-mingw-release @@ -3,7 +3,7 @@ target_host=x86_64-w64-mingw32 cc_compiler=gcc cxx_compiler=g++ -[env] +[buildenv] CONAN_CMAKE_FIND_ROOT_PATH=$toolchain CHOST=$target_host AR=$target_host-ar diff --git a/init.py b/init.py index 3fe8789..abd55ab 100755 --- a/init.py +++ b/init.py @@ -250,9 +250,8 @@ if __name__ == '__main__': cmds = [ f"{{ [[ -v VIRTUAL_ENV ]] || source {source_dir}/venv/bin/activate; }}", - f"conan install {source_dir} -pr:h {prh} -pr:b {prb} --build=missing", - f"conan install {source_dir} -pr:h {prh} -pr:b {prb} --build=missing -g deploy -if deps/", - f"cmake {source_dir} {' '.join(accumulated)}", + f"conan install {source_dir} -pr:h {prh} -pr:b {prb} --build=missing -of deps/", + f"cmake {source_dir} {' '.join(accumulated)} -DCMAKE_TOOLCHAIN_FILE=deps/conan_toolchain.cmake", ' '.join(accum.build) ]