Skip to content

Commit

Permalink
Build procedure migrated to Conan 2.*
Browse files Browse the repository at this point in the history
  • Loading branch information
tyoma authored and Artem Gevorkyan committed Jan 21, 2025
1 parent 83174b9 commit 3ef94a6
Show file tree
Hide file tree
Showing 12 changed files with 731 additions and 1,058 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
config:
- os: ubuntu-22.04
- os: windows-2019
- os: macos-12
- os: macos-13

steps:
- uses: actions/checkout@v2
Expand All @@ -33,11 +33,9 @@ jobs:
- name: Install Conan
id: conan
uses: turtlebrowser/get-conan@main
with:
version: 1.59.0

- name: Configure CMake
run: cmake -B ${{github.workspace}}/_build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
run: cmake -B ${{github.workspace}}/_build -S ${{github.workspace}} -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=${{github.workspace}}/build.props/conan_provider.cmake -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCONAN_HOST_PROFILE=${{github.workspace}}/build.props/conan.${{runner.os}}.profile

- name: Build
run: cmake --build ${{github.workspace}}/_build --config ${{env.BUILD_TYPE}} --parallel 4
Expand Down
7 changes: 7 additions & 0 deletions build.props/conan.Linux.profile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[settings]
arch=x86_64
build_type=Release
compiler=gcc
compiler.cppstd=11
compiler.version=10
os=Linux
8 changes: 8 additions & 0 deletions build.props/conan.Windows.profile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[settings]
arch=x86_64
build_type=Release
compiler=msvc
compiler.cppstd=14
compiler.runtime=static
compiler.version=194
os=Windows
1,026 changes: 0 additions & 1,026 deletions build.props/conan.cmake

This file was deleted.

7 changes: 7 additions & 0 deletions build.props/conan.macOS.profile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[settings]
arch=x86_64
build_type=Release
compiler=clang
compiler.cppstd=11
compiler.version=14
os=Macos
Loading

0 comments on commit 3ef94a6

Please sign in to comment.