From 053c17be0914010385fb0a333626cd5ba08bf033 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Mon, 21 Dec 2020 23:42:28 +0100 Subject: [PATCH] build: CMAKE_TOOLCHAIN_FILE fixed for test_package workflow --- .github/workflows/ci-test-package-cmake.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-test-package-cmake.yml b/.github/workflows/ci-test-package-cmake.yml index ded7ef34..4bc698d3 100644 --- a/.github/workflows/ci-test-package-cmake.yml +++ b/.github/workflows/ci-test-package-cmake.yml @@ -81,7 +81,7 @@ jobs: - name: Configure mp-units CMake run: | cd build/${{ matrix.build_type }} - cmake ../../src -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_TOOLCHAIN_FILE=conan_paths.cmake + cmake ../../src -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake - name: Install mp-units run: | cd build/${{ matrix.build_type }} @@ -89,7 +89,7 @@ jobs: - name: Configure test_package CMake run: | mkdir -p test_package/build/${{ matrix.build_type }} && cd test_package/build/${{ matrix.build_type }} - cmake ../.. -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_INSTALL_PREFIX=../../../build/${{ matrix.build_type }}/test_package -DCMAKE_TOOLCHAIN_FILE=../../../build/${{ matrix.build_type }}/conan_paths.cmake + cmake ../.. -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_INSTALL_PREFIX=../../../build/${{ matrix.build_type }}/test_package -DCMAKE_TOOLCHAIN_FILE=../../../build/${{ matrix.build_type }}/conan_toolchain.cmake - name: Build test_package run: | cd test_package/build/${{ matrix.build_type }}