From 03c56c5e066d8a750299196bd0095680231499d4 Mon Sep 17 00:00:00 2001 From: Danil Eremenko Date: Wed, 21 Jun 2023 16:14:56 +0300 Subject: [PATCH 1/3] cmake changes --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e3ab8f9..afe1227 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,12 @@ cmake_minimum_required(VERSION 3.16) -project(triangle_intersections CXX C) +project(Interpol CXX C) set(CMAKE_CXX_STANDARD 20) set(CMAKE_C_STANDARD 99) -if(UNIX AND NOT APPLE) +if(WIN32) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static") +elseif(UNIX AND NOT APPLE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libstdc++ -static-libgcc") endif() From 7071a8d2e375f93f3dbee98a0bbbb1d0c4d658c7 Mon Sep 17 00:00:00 2001 From: Danil Eremenko Date: Wed, 21 Jun 2023 16:18:30 +0300 Subject: [PATCH 2/3] fix yaml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 475c99b..6b8c355 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,10 +4,10 @@ name: CI on: push: branches: - - main + - develop pull_request: branches: - - main + - develop jobs: build: From 4b9b0efbc284181100b0ae6fa76b1448d989c291 Mon Sep 17 00:00:00 2001 From: Danil Eremenko Date: Wed, 21 Jun 2023 16:23:46 +0300 Subject: [PATCH 3/3] fix gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 66a9002..29065e0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,9 @@ /build /.vscode +# github settings +./github + # Prerequisites *.d