ninja

Author: visrealm

.github/workflows/webassembly-build.yml

@@ -18,6 +18,11 @@ on:
         required: false
         default: "ubuntu-latest"
         type: string
+      generator:
+        description: "CMake generator"
+        required: false
+        default: "Ninja"
+        type: string
 
 defaults:
   run:
@@ -44,6 +49,7 @@ jobs:
     - name: Configure CMake (Emscripten)
       run: |
         cmake -S . -B build/wasm \
+          -G "${{ inputs.generator }}" \
           -DCMAKE_TOOLCHAIN_FILE=$EM_TOOLCHAIN \
           -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} \
           -DVR_EMU_LCD_BUILD_WASM=ON

.github/workflows/webassembly-windows.yml

@@ -15,3 +15,4 @@ jobs:
       emsdk_version: latest
       build_type: Release
       runner: windows-latest
+      generator: Ninja

CMakeLists.txt

@@ -43,12 +43,9 @@ message(STATUS "VR_EMU_LCD_USING_EMSDK=${VR_EMU_LCD_USING_EMSDK} VR_EMU_LCD_BUIL
 # that MSVC cannot parse (e.g., -Wextra) from the toolchain-provided defaults.
 if (VR_EMU_LCD_USING_EMSDK AND (MSVC OR CMAKE_C_SIMULATE_ID STREQUAL "MSVC"))
   foreach(lang C CXX)
-    if (DEFINED CMAKE_${lang}_FLAGS)
-      string(REPLACE "-Wall" "" CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS}")
-      string(REPLACE "-Wextra" "" CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS}")
-      string(REPLACE "-Wpedantic" "" CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS}")
-      set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS}" CACHE STRING "" FORCE)
-    endif()
+    foreach(cfg "" _DEBUG _RELEASE _RELWITHDEBINFO _MINSIZEREL)
+      set(CMAKE_${lang}_FLAGS${cfg} "" CACHE STRING "" FORCE)
+    endforeach()
   endforeach()
 endif()