Skip to content

Commit b7ae847

Browse files
authored
Fix a conan issue (#241)
1 parent 8da2d40 commit b7ae847

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.github/workflows/cmake.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,15 @@ jobs:
3636
shell: pwsh
3737
working-directory: ./build
3838
run: |
39-
conan install .. -s compiler="Visual Studio" -s compiler.version=16 -sbuild_type=Debug -g cmake_paths
39+
conan profile detect
40+
conan install .. -s compiler="msvc" -s compiler.version=193 -sbuild_type=Debug --build=missing
4041
4142
- name: Create Build Environment & Configure Cmake
4243
shell: bash
4344
working-directory: ./build
4445
run: |
4546
[[ ${{ matrix.link }} == "SHARED" ]] && shared="ON" || shared="OFF"
46-
cmake .. -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=on -DBUILD_SHARED_LIBS=$shared -DCMAKE_TOOLCHAIN_FILE="conan_paths.cmake" -DCMAKE_INSTALL_PREFIX=../install
47+
cmake .. -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=on -DBUILD_SHARED_LIBS=$shared -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_POLICY_DEFAULT_CMP0091=NEW
4748
4849
- name: Build
4950
working-directory: ${{env.GITHUB_WORKSPACE}}

conanfile.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[requires]
22
gtest/1.10.0
3-
openssl/1.1.1j
3+
openssl/1.1.1t
44
#c-ares/1.17.1
55

66
[generators]
7-
cmake_paths
7+
CMakeToolchain
88

99
[options]
1010

0 commit comments

Comments
 (0)