From 89d704f86763744e25e46256a9a202ebba33ff0d Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Thu, 9 Sep 2021 10:20:53 +0200 Subject: [PATCH] ci: Setting CMake generator in Conan fixed for VS2019 --- .github/workflows/ci-test-package-cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-test-package-cmake.yml b/.github/workflows/ci-test-package-cmake.yml index f3342aa1..043d53e7 100644 --- a/.github/workflows/ci-test-package-cmake.yml +++ b/.github/workflows/ci-test-package-cmake.yml @@ -84,7 +84,6 @@ jobs: CC: ${{ matrix.config.compiler.cc }} CXX: ${{ matrix.config.compiler.cxx }} CMAKE_GENERATOR: Ninja - CONAN_CMAKE_GENERATOR: Ninja steps: - uses: actions/checkout@v2 @@ -143,6 +142,7 @@ jobs: if [[ "${{ matrix.config.compiler.type }}" == "GCC" || "${{ matrix.config.compiler.type }}" == "CLANG" ]]; then conan profile update settings.compiler.libcxx=${{ matrix.config.lib }} default fi + conan profile update conf.tools.cmake.cmaketoolchain:generator=Ninja default conan profile show default - name: Add support for clang-13 to Conan's settings.yml # TODO Remove when Conan will support clang-13