Commit ae987b4b authored by Robert Edmonds's avatar Robert Edmonds

build.yml: Try setting -DCMAKE_MSVC_RUNTIME_LIBRARY for abseil, protobuf,...

build.yml: Try setting -DCMAKE_MSVC_RUNTIME_LIBRARY for abseil, protobuf, protobuf-c builds on Windows
parent 26d0ce22
...@@ -130,6 +130,9 @@ jobs: ...@@ -130,6 +130,9 @@ jobs:
name: "MSVC CMake (${{ matrix.build-type }}, DLL: ${{ matrix.shared-lib }})" name: "MSVC CMake (${{ matrix.build-type }}, DLL: ${{ matrix.shared-lib }})"
env:
MSVC_RUNTIME_LIBRARY: "MultiThreaded${{ matrix.build-type == 'Debug' && 'Debug' || '' }}${{ matrix.shared-lib == 'ON' && 'DLL' || '' }}"
steps: steps:
- uses: ilammy/msvc-dev-cmd@v1 - uses: ilammy/msvc-dev-cmd@v1
with: with:
...@@ -159,7 +162,7 @@ jobs: ...@@ -159,7 +162,7 @@ jobs:
-DCMAKE_CXX_STANDARD=17 ` -DCMAKE_CXX_STANDARD=17 `
-DCMAKE_INSTALL_PREFIX=~/abseil-bin ` -DCMAKE_INSTALL_PREFIX=~/abseil-bin `
-DCMAKE_BUILD_TYPE=${{ matrix.build-type }} ` -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} `
-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded${{ matrix.build-type == 'Debug' && 'Debug' || '' }}${{ matrix.shared-lib == 'ON' && 'DLL' || '' }} ` -DCMAKE_MSVC_RUNTIME_LIBRARY=${{ env.MSVC_RUNTIME_LIBRARY }} `
-DABSL_PROPAGATE_CXX_STD=ON ` -DABSL_PROPAGATE_CXX_STD=ON `
-DBUILD_SHARED_LIBS=${{ matrix.shared-lib }} ` -DBUILD_SHARED_LIBS=${{ matrix.shared-lib }} `
; ;
...@@ -173,6 +176,7 @@ jobs: ...@@ -173,6 +176,7 @@ jobs:
-DCMAKE_CXX_STANDARD=17 ` -DCMAKE_CXX_STANDARD=17 `
-DCMAKE_INSTALL_PREFIX=~/protobuf-bin ` -DCMAKE_INSTALL_PREFIX=~/protobuf-bin `
-DCMAKE_BUILD_TYPE=${{ matrix.build-type }} ` -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} `
-DCMAKE_MSVC_RUNTIME_LIBRARY=${{ env.MSVC_RUNTIME_LIBRARY }} `
-DABSL_PROPAGATE_CXX_STD=ON ` -DABSL_PROPAGATE_CXX_STD=ON `
-Dabsl_ROOT=~/abseil-bin ` -Dabsl_ROOT=~/abseil-bin `
-Dprotobuf_ABSL_PROVIDER=package ` -Dprotobuf_ABSL_PROVIDER=package `
...@@ -189,6 +193,7 @@ jobs: ...@@ -189,6 +193,7 @@ jobs:
cmake -S build-cmake -B build -G "NMake Makefiles" ` cmake -S build-cmake -B build -G "NMake Makefiles" `
-DCMAKE_INSTALL_PREFIX=~/protobuf-c-bin ` -DCMAKE_INSTALL_PREFIX=~/protobuf-c-bin `
-DCMAKE_BUILD_TYPE=${{ matrix.build-type }} ` -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} `
-DCMAKE_MSVC_RUNTIME_LIBRARY=${{ env.MSVC_RUNTIME_LIBRARY }} `
-DBUILD_TESTS=ON ` -DBUILD_TESTS=ON `
-DBUILD_SHARED_LIBS=${{ matrix.shared-lib }} ` -DBUILD_SHARED_LIBS=${{ matrix.shared-lib }} `
-DProtobuf_ROOT="~/protobuf-bin" ` -DProtobuf_ROOT="~/protobuf-bin" `
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment