Skip to content

Commit

Permalink
Eliminate some warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
thejohnfreeman committed Nov 6, 2024
1 parent 3545efd commit bc071a8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions 00-upstream/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ class Zero(ConanFile):
license = 'ISC'
author = 'John Freeman <[email protected]>'
url = 'https://github.com/thejohnfreeman/project-template-cpp'
description = 'A project with no binary requirements.'

settings = 'os', 'compiler', 'build_type', 'arch'
options = {'shared': [True, False], 'fPIC': [True, False]}
Expand Down
4 changes: 3 additions & 1 deletion Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ conanfile := $(wildcard conanfile.*)
conan_toolchain := ${build_dir}/conan_toolchain.cmake

${conan_toolchain} : ${conanfile} | ${build_dir}
${CMAKE} -E chdir ${build_dir} ${CONAN} install ${source_dir} --build missing -s build_type=${flavor}
${CMAKE} -E chdir ${build_dir} ${CONAN} install ${source_dir} \
--build missing -s build_type=${flavor} \
--profile:build default --profile:host default

conan : ${conan_toolchain}

Expand Down

0 comments on commit bc071a8

Please sign in to comment.