Skip to content

Commit c3ed9dc

Browse files
authored
Update EMCC_SUFFIX instead of trying to manually determine which platform we are cross compiling from (#683)
1 parent 3bc3b46 commit c3ed9dc

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

cmake/modules/GoogleTest.cmake

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,11 @@ endif()
2020

2121
include(ExternalProject)
2222
if (EMSCRIPTEN)
23-
if (CMAKE_C_COMPILER MATCHES ".bat")
24-
set(config_cmd emcmake.bat cmake)
25-
if(CMAKE_GENERATOR STREQUAL "Ninja")
26-
set(build_cmd emmake.bat ninja)
27-
else()
28-
set(build_cmd emmake.bat make)
29-
endif()
23+
set(config_cmd emcmake${EMCC_SUFFIX} cmake)
24+
if(CMAKE_GENERATOR STREQUAL "Ninja")
25+
set(build_cmd emmake${EMCC_SUFFIX} ninja)
3026
else()
31-
set(config_cmd emcmake cmake)
32-
if(CMAKE_GENERATOR STREQUAL "Ninja")
33-
set(build_cmd emmake ninja)
34-
else()
35-
set(build_cmd emmake make)
36-
endif()
27+
set(build_cmd emmake${EMCC_SUFFIX} make)
3728
endif()
3829
else()
3930
set(config_cmd ${CMAKE_COMMAND})

0 commit comments

Comments
 (0)