From 2ea9aece4fe9df2a80b9264d1aea2fc497467bdb Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Wed, 12 Aug 2020 10:17:51 +0100 Subject: [PATCH] Github actions for MSVC --- .github/workflows/main.yml | 4 ++-- test/CMakeLists.txt | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e71b5e26..4d5366fe 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ jobs: - name: Build and run run: | - cmake ./ + cmake -DNO_STL=0 ./ MSBuild etl.sln build-visual-studio-no-stl: @@ -30,5 +30,5 @@ jobs: - name: Build and run run: | - cmake -DETL_NO_STL=1 ./ + cmake -DNO_STL=1 ./ MSBuild etl.sln diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 06121a05..a948bccd 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -3,6 +3,10 @@ project(etl_unit_tests) add_definitions(-DETL_DEBUG) +if (NO_STL EQUAL 1) + add_definitions(-DETL_NO_STL) +endif() + if(NOT UnitTest++_FOUND) # Add unittest-cpp as an ExternalProject include(cmake/unit-test_external_project.cmake)