Skip to content

Commit 9ab486a

Browse files
committed
updated pipelines
1 parent e6daf8e commit 9ab486a

File tree

4 files changed

+5
-39
lines changed

4 files changed

+5
-39
lines changed

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
- name: Build
7272
run: |
7373
conan install . -of build --build missing
74-
cmake -S . -B ./build -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=".\build\conan_toolchain.cmake" -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded
74+
cmake -S . -B ./build -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=".\build\conan_toolchain.cmake -DMSVC_STATIC=ON
7575
cmake --build ./build --config Release -j12
7676
- name: Unittests
7777
run: .\build\bin\Release\unittests.exe

CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ if (NOT CMAKE_BUILD_TYPE)
88
set(CMAKE_BUILD_TYPE Release)
99
endif()
1010

11-
if(MSVC)
11+
option(MSVC_STATIC "Use static runtime libraries with MSVC" OFF)
12+
13+
if(MSVC AND MSVC_STATIC)
1214
add_compile_options(
1315
$<$<CONFIG:>:/MT>
1416
$<$<CONFIG:Debug>:/MTd>

README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
[![CI](https://github.com/ThoSe1990/cucumber-cpp/actions/workflows/main.yml/badge.svg?branch=main)](https://github.com/ThoSe1990/cucumber-cpp/actions/workflows/main.yml) [![Build Status](https://dev.azure.com/thomassedlmair/cwt-cucumber/_apis/build/status%2FThoSe1990.cwt-cucumber?branchName=main)](https://dev.azure.com/thomassedlmair/cwt-cucumber/_build/latest?definitionId=14&branchName=main)
2-
1+
[![CI](https://github.com/ThoSe1990/cucumber-cpp/actions/workflows/main.yml/badge.svg?branch=main)](https://github.com/ThoSe1990/cucumber-cpp/actions/workflows/main.yml)
32

43
## Coding With Thomas Cucumber: A C++ Cucumber Interpreter
54

azure-pipelines.yml

-35
This file was deleted.

0 commit comments

Comments
 (0)