Skip to content

Fix ninja Emscripten build #648

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

Merged
mcbarton merged 1 commit into from
Jun 27, 2025
Merged

Fix ninja Emscripten build #648

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions cmake/modules/GoogleTest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,18 @@ include(ExternalProject)
if (EMSCRIPTEN)
if (CMAKE_C_COMPILER MATCHES ".bat")
set(config_cmd emcmake.bat cmake)
set(build_cmd emmake.bat make)
if(CMAKE_GENERATOR STREQUAL "Ninja")
set(build_cmd emmake.bat ninja)
else()
set(build_cmd emmake.bat make)
endif()
else()
set(config_cmd emcmake cmake)
set(build_cmd emmake make)
if(CMAKE_GENERATOR STREQUAL "Ninja")
set(build_cmd emmake ninja)
else()
set(build_cmd emmake make)
endif()
endif()
else()
set(config_cmd ${CMAKE_COMMAND})
Expand Down
Loading