Revert "conan: migrate profiles to conan2"

This reverts commit 5ed344ee03.
This commit is contained in:
Danny Robson 2023-05-15 11:26:25 +10:00
parent 65ecb7ec3b
commit 1b84d5eee8
9 changed files with 25 additions and 12 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++
[buildenv] [env]
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,7 +10,9 @@ build_type=Release
[options] [options]
[buildenv] [build_requires]
[env]
CC=afl-clang CC=afl-clang
CXX=afl-clang++ CXX=afl-clang++
CFLAGS="-flto" CFLAGS="-flto"

View File

@ -10,6 +10,8 @@ build_type=Debug
[options] [options]
[buildenv] [build_requires]
[env]
CC=clang-16 CC=clang-16
CXX=clang++-16 CXX=clang++-16

View File

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

View File

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

View File

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

View File

@ -10,7 +10,9 @@ build_type=Release
[options] [options]
[buildenv] [build_requires]
[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++
[buildenv] [env]
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,8 +250,9 @@ 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 -of deps/", f"conan install {source_dir} -pr:h {prh} -pr:b {prb} --build=missing",
f"cmake {source_dir} {' '.join(accumulated)} -DCMAKE_TOOLCHAIN_FILE=deps/conan_toolchain.cmake", f"conan install {source_dir} -pr:h {prh} -pr:b {prb} --build=missing -g deploy -if deps/",
f"cmake {source_dir} {' '.join(accumulated)}",
' '.join(accum.build) ' '.join(accum.build)
] ]