Skip to content

Commit 0c669f9

Browse files
committed
add conan toolchain
Signed-off-by: Anton Dukhovnikov <antond@wetafx.co.nz>
1 parent 01c866c commit 0c669f9

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

.github/workflows/build-steps.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,9 @@ jobs:
7979
if: inputs.vfxyear > 2023
8080
shell: bash
8181
run: |
82-
yum install -y json-devel
83-
python -m pip install nanobind pytest
82+
conan profile detect --force
83+
conan install . --output-folder=build_deps --build=missing
84+
python -m pip install pytest
8485
8586
- name: Configure CMake
8687
run: >
@@ -90,6 +91,7 @@ jobs:
9091
-D RTA_CENTOS7_CERES_HACK=${{ inputs.ceres_hack }}
9192
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/install
9293
-D CMAKE_CXX_STANDARD=17
94+
-D CMAKE_BUILD_TYPE=${{ inputs.build_type }}
9395
-D CMAKE_TOOLCHAIN_FILE="${{ inputs.toolchain_file }}"
9496
-D ENABLE_SHARED="${{ inputs.build_shared_libs }}"
9597
@@ -118,6 +120,7 @@ jobs:
118120
-D RAWTOACES_DIR=${{ github.workspace }}/install/lib/cmake/RAWTOACES
119121
-D CMAKE_TOOLCHAIN_FILE="${{ inputs.toolchain_file }}"
120122
-D CMAKE_CXX_STANDARD=17
123+
-D CMAKE_BUILD_TYPE=${{ inputs.build_type }}
121124
122125
- name: Build config_tests
123126
if: inputs.test_install == 'ON'

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
vfxyear: ${{ matrix.vfxyear || 0 }}
2424
ceres_hack: ${{ matrix.ceres_hack || 'OFF' }}
2525
test_install: ${{ matrix.test_install || 'ON' }}
26+
toolchain_file: ${{ matrix.toolchain_file }}
2627

2728
strategy:
2829
# Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
@@ -41,10 +42,13 @@ jobs:
4142
container: aswf/ci-osl:2023-clang15
4243
- vfxyear: 2024
4344
container: aswf/ci-rawtoaces:2024.4
45+
toolchain_file: "/__w/rawtoaces/rawtoaces/build_deps/conan_toolchain.cmake"
4446
- vfxyear: 2025
4547
container: aswf/ci-rawtoaces:2025.3
48+
toolchain_file: "/__w/rawtoaces/rawtoaces/build_deps/conan_toolchain.cmake"
4649
- vfxyear: 2026
4750
container: aswf/ci-rawtoaces:2026.1
51+
toolchain_file: "/__w/rawtoaces/rawtoaces/build_deps/conan_toolchain.cmake"
4852

4953
build:
5054
name: "${{matrix.os}} ${{matrix.c_compiler}}"

conanfile.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[requires]
2+
nlohmann_json/3.12.0
3+
nanobind/2.9.2
4+
5+
[generators]
6+
CMakeDeps
7+
CMakeToolchain

0 commit comments

Comments
 (0)