conan: migrate profiles to conan2

This commit is contained in:
Danny Robson 2023-04-21 10:27:25 +10:00
parent f4e34a86a2
commit 5ed344ee03
9 changed files with 20 additions and 32 deletions

View File

@ -3,7 +3,7 @@ target_host=armv7a-unknown-linux-gnueabihf
cc_compiler=gcc cc_compiler=gcc
cxx_compiler=g++ cxx_compiler=g++
[env] [buildenv]
CONAN_CMAKE_FIND_ROOT_PATH=$toolchain CONAN_CMAKE_FIND_ROOT_PATH=$toolchain
CHOST=$target_host CHOST=$target_host
AR=$target_host-ar AR=$target_host-ar

View File

@ -10,9 +10,7 @@ build_type=Release
[options] [options]
[build_requires] [buildenv]
[env]
CC=afl-clang CC=afl-clang
CXX=afl-clang++ CXX=afl-clang++
CFLAGS="-flto" CFLAGS="-flto"

View File

@ -3,15 +3,13 @@ os=Linux
arch=x86_64 arch=x86_64
compiler=clang compiler=clang
compiler.version=14 compiler.version=15
compiler.libcxx=libc++ compiler.libcxx=libc++
build_type=Debug build_type=Debug
[options] [options]
[build_requires] [buildenv]
CC=clang-15
[env] CXX=clang++-15
CC=clang-14
CXX=clang++-14

View File

@ -3,17 +3,16 @@ os=Linux
arch=x86_64 arch=x86_64
compiler=clang compiler=clang
compiler.version=14 compiler.version=15
compiler.libcxx=libc++ #compiler.libcxx=libc++
compiler.libcxx=libstdc++11
build_type=Release build_type=Release
[options] [options]
[build_requires] [buildenv]
CC=clang-15
[env] CXX=clang++-15
CC=clang-14
CXX=clang++-14
CFLAGS="-flto" CFLAGS="-flto"
CXXFLAGS="-flto" CXXFLAGS="-flto"

View File

@ -10,9 +10,7 @@ build_type=Release
[options] [options]
[build_requires] [buildenv]
[env]
CC=clang-14 CC=clang-14
CXX=clang++-14 CXX=clang++-14
CXXFLAGS="-fsanitize=undefined -fsanitize=address -fsanitize=leak" CXXFLAGS="-fsanitize=undefined -fsanitize=address -fsanitize=leak"

View File

@ -10,9 +10,7 @@ build_type=Debug
[options] [options]
[build_requires] [buildenv]
CC=gcc-12
[env] CXX=g++-12
CC=gcc
CXX=g++
CXXFLAGS=-D_GLIBCXX_DEBUG CXXFLAGS=-D_GLIBCXX_DEBUG

View File

@ -10,9 +10,7 @@ build_type=Release
[options] [options]
[build_requires] [buildenv]
[env]
CC=gcc CC=gcc
CXX=g++ CXX=g++
CXXFLAGS="-flto -ffat-lto-objects" CXXFLAGS="-flto -ffat-lto-objects"

View File

@ -3,7 +3,7 @@ target_host=x86_64-w64-mingw32
cc_compiler=gcc cc_compiler=gcc
cxx_compiler=g++ cxx_compiler=g++
[env] [buildenv]
CONAN_CMAKE_FIND_ROOT_PATH=$toolchain CONAN_CMAKE_FIND_ROOT_PATH=$toolchain
CHOST=$target_host CHOST=$target_host
AR=$target_host-ar AR=$target_host-ar

View File

@ -250,9 +250,8 @@ if __name__ == '__main__':
cmds = [ cmds = [
f"{{ [[ -v VIRTUAL_ENV ]] || source {source_dir}/venv/bin/activate; }}", 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 -of deps/",
f"conan install {source_dir} -pr:h {prh} -pr:b {prb} --build=missing -g deploy -if deps/", f"cmake {source_dir} {' '.join(accumulated)} -DCMAKE_TOOLCHAIN_FILE=deps/conan_toolchain.cmake",
f"cmake {source_dir} {' '.join(accumulated)}",
' '.join(accum.build) ' '.join(accum.build)
] ]