Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ninja multi config generator #354

Merged
merged 2 commits into from
Dec 21, 2023
+5 −1
Merged

Fix ninja multi config generator #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff448a6
add ninja multi fix
vrcomputing Dec 21, 2023
9389e14
use Ninja Multi-Config
vrcomputing Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
cc: "gcc",
cxx: "g++",
archiver: "7z a",
generators: "Ninja",
generators: "Ninja Multi-Config",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@uwerat this is meant as a temporary change but can be kept if we e.g. want to build and delivery multi config packages which I'm a fan of and qskinny is small enough that it doesn't matter size wise

env: { DISPLAY: ":1" },
cmake:
{
Expand Down
4 changes: 4 additions & 0 deletions tools/svg2qvg/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_$<CONFIG>)
else()
target_include_directories(${target} PRIVATE ${qskinny_AUTOGEN_DIR}/include)
endif()
Expand Down
Loading