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

Jump to bottom

Fix to allow ninja to use make for generators #123

Merged
merged 2 commits into from
Mar 3, 2023
Merged

Fix to allow ninja to use make for generators #123

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93322c2
Fix to allow ninja to use make for generators
mjcarroll Mar 1, 2023
6bb4541
Find make binary on all non-Windows platforms
mjcarroll Mar 2, 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
4 changes: 4 additions & 0 deletions cmake/sip_helper.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@ function(build_sip_binding PROJECT_NAME SIP_FILE)

if(WIN32)
set(MAKE_EXECUTABLE NMake.exe)
elseif(CMAKE_GENERATOR MATCHES "Ninja")
find_program(MAKE_PROGRAM NAMES make)
message(STATUS "Using Ninja generator with SIP requires make, found: ${MAKE_PROGRAM}")
set(MAKE_EXECUTABLE ${MAKE_PROGRAM})
else()
set(MAKE_EXECUTABLE "\$(MAKE)")
endif()
mjcarroll marked this conversation as resolved.
Show resolved Hide resolved
Expand Down