diff options
| -rw-r--r-- | .github/workflows/release-ninja-binaries.yml | 4 | ||||
| -rw-r--r-- | CMakeLists.txt | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/.github/workflows/release-ninja-binaries.yml b/.github/workflows/release-ninja-binaries.yml index 8c1e0af..a45b6e9 100644 --- a/.github/workflows/release-ninja-binaries.yml +++ b/.github/workflows/release-ninja-binaries.yml @@ -15,8 +15,10 @@ jobs: include: - os: macOS-latest zip_name: ninja-mac + extra_cmake_flags: '' - os: windows-latest zip_name: ninja-win + extra_cmake_flags: '-DMSVC_RUNTIME_LIBRARY=MultiThreaded' steps: - uses: actions/checkout@v1 @@ -33,7 +35,7 @@ jobs: shell: bash run: | mkdir build && cd build - cmake -DCMAKE_BUILD_TYPE=Release .. + cmake -DCMAKE_BUILD_TYPE=Release ${{ matrix.extra_cmake_flags }} .. cmake --build . --parallel --config Release ctest -vv diff --git a/CMakeLists.txt b/CMakeLists.txt index e9f6563..206435e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,7 @@ cmake_minimum_required(VERSION 3.12) +if(MSVC) + cmake_policy(VERSION 3.15) +endif() project(ninja) if(CMAKE_BUILD_TYPE MATCHES "Release") |