Skip to content

Commit fb8f52f

Browse files
committed
UPD | windows workflow #4.1
1 parent 90f8cc5 commit fb8f52f

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/conan_build_and_test_win.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,16 @@ jobs:
6363
- name: Conan install dependencies (shared)
6464
if: ${{ matrix.library_type == 'SHARED' }}
6565
run: conan install . -o "manapihttp/*:shared=False" -o "manapihttp/*:lib=True" -o "manapihttp/*:json_debug=False" -o "manapihttp/*:openssl_dependency=True" -o "manapihttp/*:wolfssl_dependency=False" -o "manapihttp/*:quiche_dependency=False" -o "manapihttp/*:tquic_dependency=False" -o "manapihttp/*:zlib_dependency=True" -o "manapihttp/*:curl_dependency=True" -o "manapihttp/*:gmp_dependency=True" -o "manapihttp/*:zstd_dependency=True" -o "manapihttp/*:brotli_dependency=True" -o "manapihttp/*:grpc_dependency=False" -o "manapihttp/*:nghttp2_dependency=True" -o "manapihttp/*:nghttp3_dependency=True" -o "manapihttp/*:cpptrace_dependency=False" -b=missing
66-
# run: conan install . -o "manapihttp/*:shared=True" -o "manapihttp/*:lib=True" -o "manapihttp/*:json_debug=False" -o "manapihttp/*:openssl_dependency=False" -o "manapihttp/*:wolfssl_dependency=False" -o "manapihttp/*:quiche_dependency=False" -o "manapihttp/*:tquic_dependency=False" -o "manapihttp/*:zlib_dependency=False" -o "manapihttp/*:curl_dependency=False" -o "manapihttp/*:gmp_dependency=False" -o "manapihttp/*:zstd_dependency=False" -o "manapihttp/*:brotli_dependency=False" -o "manapihttp/*:grpc_dependency=False" -o "manapihttp/*:nghttp2_dependency=False" -o "manapihttp/*:nghttp3_dependency=False" -o "manapihttp/*:cpptrace_dependency=False" -b=missing
6766

6867
- name: Conan install dependencies (static)
6968
if: ${{ matrix.library_type == 'STATIC' }}
7069
run: conan install . -o "manapihttp/*:shared=True" -o "manapihttp/*:lib=True" -o "manapihttp/*:json_debug=False" -o "manapihttp/*:openssl_dependency=True" -o "manapihttp/*:wolfssl_dependency=False" -o "manapihttp/*:quiche_dependency=False" -o "manapihttp/*:tquic_dependency=False" -o "manapihttp/*:zlib_dependency=True" -o "manapihttp/*:curl_dependency=True" -o "manapihttp/*:gmp_dependency=True" -o "manapihttp/*:zstd_dependency=True" -o "manapihttp/*:brotli_dependency=True" -o "manapihttp/*:grpc_dependency=False" -o "manapihttp/*:nghttp2_dependency=True" -o "manapihttp/*:nghttp3_dependency=True" -o "manapihttp/*:cpptrace_dependency=False" -b=missing
71-
# run: conan install . -o "manapihttp/*:shared=True" -o "manapihttp/*:lib=True" -o "manapihttp/*:json_debug=False" -o "manapihttp/*:openssl_dependency=False" -o "manapihttp/*:wolfssl_dependency=False" -o "manapihttp/*:quiche_dependency=False" -o "manapihttp/*:tquic_dependency=False" -o "manapihttp/*:zlib_dependency=False" -o "manapihttp/*:curl_dependency=False" -o "manapihttp/*:gmp_dependency=False" -o "manapihttp/*:zstd_dependency=False" -o "manapihttp/*:brotli_dependency=False" -o "manapihttp/*:grpc_dependency=False" -o "manapihttp/*:nghttp2_dependency=False" -o "manapihttp/*:nghttp3_dependency=False" -o "manapihttp/*:cpptrace_dependency=False" -b=missing
7270

7371
- name: Clean up
7472
run: conan cache clean "*/*"
7573

7674
- name: Configure CMake
77-
run: cmake -B build -DMANAPIHTTP_ENABLE_TESTS=ON -DMANAPIHTTP_DISABLE_TRACE_HARD=ON -DMANAPIHTTP_STD_BACKTRACE_DEPENDENCY=OFF
75+
run: cmake -B build -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES="conan_toolchain.cmake" -DMANAPIHTTP_ENABLE_TESTS=ON -DMANAPIHTTP_DISABLE_TRACE_HARD=ON -DMANAPIHTTP_STD_BACKTRACE_DEPENDENCY=OFF
7876

7977
- name: Build
8078
run: cmake --build build -j4

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ endif ()
1010

1111
include(CTest)
1212

13-
if (EXISTS "./build/generators/conan_toolchain.cmake")
14-
include(./build/generators/conan_toolchain.cmake)
13+
if (EXISTS "${CMAKE_BINARY_DIR}/generators/conan_toolchain.cmake")
14+
include("${CMAKE_BINARY_DIR}/generators/conan_toolchain.cmake")
15+
elseif (EXISTS "${CMAKE_BINARY_DIR}/conan_toolchain.cmake")
16+
include("${CMAKE_BINARY_DIR}/conan_toolchain.cmake")
1517
endif ()
1618

1719
if (WIN32)

0 commit comments

Comments
 (0)