From 3528c16ac7a458afd298ef8bf61efc9070094310 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Thu, 5 Sep 2024 07:45:19 +0200 Subject: [PATCH] ci: convert to use CMake Convert the CI to use CMake instead of Makefiles. This will allow us to wire up support for Windows in a subsequent commit. --- .github/workflows/ci.yml | 6 ++++-- test/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b1ac2de..ea05f05 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,5 +19,7 @@ jobs: uses: actions/checkout@v2 - name: Build run: | - cd test - make + mkdir build + cd build + cmake .. + cmake --build . diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 5c40e58..f6760b8 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -14,7 +14,7 @@ set_target_properties(clar_test PROPERTIES ) # MSVC generates all kinds of warnings. -if(NOT "${CMAKEC_COMPILER_ID}" MATCHES "MSVC") +if (NOT MSVC) set_target_properties(clar_test PROPERTIES COMPILE_WARNING_AS_ERROR ON )