From ff448a6f0a05ee7dd52c2173f19e2c216d21b45a Mon Sep 17 00:00:00 2001 From: Rick Vogel Date: Thu, 21 Dec 2023 16:32:49 +0100 Subject: [PATCH 1/2] add ninja multi fix --- tools/svg2qvg/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/svg2qvg/CMakeLists.txt b/tools/svg2qvg/CMakeLists.txt index b468fd447..6c64b50ce 100644 --- a/tools/svg2qvg/CMakeLists.txt +++ b/tools/svg2qvg/CMakeLists.txt @@ -22,6 +22,10 @@ if(BUILD_SVG2QVG_STANDALONE) # TODO fix multi configuration generators if(CMAKE_GENERATOR MATCHES "Visual Studio.*") add_definitions("/I${qskinny_AUTOGEN_DIR}/include_\$(Configuration)") + elseif(CMAKE_GENERATOR MATCHES "Ninja Multi.*") + target_include_directories(${target} + PRIVATE + ${qskinny_AUTOGEN_DIR}/include_$) else() target_include_directories(${target} PRIVATE ${qskinny_AUTOGEN_DIR}/include) endif() From 9389e148a802272b99eaccc04d3fd610fc69a9f7 Mon Sep 17 00:00:00 2001 From: Rick Vogel Date: Thu, 21 Dec 2023 16:34:24 +0100 Subject: [PATCH 2/2] use Ninja Multi-Config --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 632d8313d..5662b48d5 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -104,7 +104,7 @@ jobs: cc: "gcc", cxx: "g++", archiver: "7z a", - generators: "Ninja", + generators: "Ninja Multi-Config", env: { DISPLAY: ":1" }, cmake: {