From 9da1698b0b7c8bbc0100828c4122cc3579d6bac7 Mon Sep 17 00:00:00 2001
From: AnonymusRaccoon
Date: Thu, 6 Feb 2020 15:43:41 +0100
Subject: [PATCH] Finishing the windows's CI (I think)
---
.github/workflows/buildwin.yml | 2 +-
CMakeLists.txt | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/buildwin.yml b/.github/workflows/buildwin.yml
index 41a449f..d605c92 100644
--- a/.github/workflows/buildwin.yml
+++ b/.github/workflows/buildwin.yml
@@ -19,7 +19,7 @@ jobs:
- name: Build Makefile with CMake
run: |
Set-Location build
- cmake -DCMAKE_CXX_FLAGS=-isystem\ build/include .. -G "MinGW Makefiles" -DCMAKE_SH="CMAKE_SH-NOTFOUND"
+ cmake .. -G "MinGW Makefiles" -DCMAKE_SH="CMAKE_SH-NOTFOUND" -DGITBUILD=true
- name: Build with Makefile
run: mingw32-make -C build ComSquare
- name: Copy shared libs
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37c6a15..58c6156 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,6 +52,12 @@ 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 ()
+
# make app
add_executable(ComSquare
main.cpp