From 91a8fc91d6636e15a8967b764928bd37bae5e656 Mon Sep 17 00:00:00 2001 From: black-sliver <59490463+black-sliver@users.noreply.github.com> Date: Wed, 19 Feb 2025 13:50:25 +0100 Subject: [PATCH] CI: fix native tests toolchain on windows (#4668) * CI: ctest: fix trigger on CMakeLists change * CI: ctest: update cmake version this removes a warning and matches gtest * CI: ctest: remove explicit build mode for MSVC gtest switched to dynamic libc (/MD), which is default, so this just works now --- .github/workflows/ctest.yml | 4 ++-- test/cpp/CMakeLists.txt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ctest.yml b/.github/workflows/ctest.yml index 9492c83c..a0ae2cb2 100644 --- a/.github/workflows/ctest.yml +++ b/.github/workflows/ctest.yml @@ -11,7 +11,7 @@ on: - '**.hh?' - '**.hpp' - '**.hxx' - - '**.CMakeLists' + - '**/CMakeLists.txt' - '.github/workflows/ctest.yml' pull_request: paths: @@ -21,7 +21,7 @@ on: - '**.hh?' - '**.hpp' - '**.hxx' - - '**.CMakeLists' + - '**/CMakeLists.txt' - '.github/workflows/ctest.yml' jobs: diff --git a/test/cpp/CMakeLists.txt b/test/cpp/CMakeLists.txt index 927b7494..03deb8f9 100644 --- a/test/cpp/CMakeLists.txt +++ b/test/cpp/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.16) project(ap-cpp-tests) enable_testing() @@ -7,8 +7,8 @@ find_package(GTest REQUIRED) if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") add_definitions("/source-charset:utf-8") - set(CMAKE_CXX_FLAGS_DEBUG "/MTd") - set(CMAKE_CXX_FLAGS_RELEASE "/MT") + # set(CMAKE_CXX_FLAGS_DEBUG "/MDd") # this is the default + # set(CMAKE_CXX_FLAGS_RELEASE "/MD") # this is the default elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") # enable static analysis for gcc add_compile_options(-fanalyzer -Werror)