From 1a8d58264653fa69df28388d6dc79180d37fc20c Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Thu, 4 Feb 2021 16:15:40 +0100 Subject: [PATCH] Installing SFML & QT5 for tests, I'm tired --- .github/workflows/test.yml | 5 ++++- CMakeLists.txt | 6 ------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8f487d0..5de8a5e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,6 +21,9 @@ jobs: uses: actions/setup-python@v1 with: python-version: '3.x' + - name: Install the SFML. + run: sudo apt-get update && + sudo apt-get install --yes libsfml-dev qt5-default - name: Install Criterion run: sudo add-apt-repository ppa:snaipewastaken/ppa && sudo apt-get update && @@ -28,7 +31,7 @@ jobs: - name: Install Gcovr run: python -m pip install --upgrade pip gcovr - name: Build Makefile with CMake - run: mkdir -p build && cd build && cmake .. --target unit_tests + run: mkdir -p build && cd build && cmake .. - name: Build with Makefile run: make -C build unit_tests - name: Execute tests diff --git a/CMakeLists.txt b/CMakeLists.txt index 22d3311..9db1d4a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,12 +109,6 @@ add_executable(unit_tests target_link_libraries(unit_tests criterion -lgcov) target_compile_options(unit_tests PUBLIC -fprofile-arcs -ftest-coverage) -if ("${GITBUILD}" STREQUAL true) - include_directories(ComSquare build/include) - link_directories(ComSquare build/lib) - message("Git build is true") -endif () - set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON)