Merge branch 'main' into add-clang-tidy

kirkrodrigues · Oct 6, 2024 · b9fa11b · b9fa11b
2 parents f9ed9ac + 0ca63a2
commit b9fa11b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,15 +17,6 @@ project(
     VERSION 0.1.0
 )
 
-# Enforce "Unix Makefiles" because "Ninja" does not work with the Emscripten toolchain on CXX_20
-# sources.
-if(NOT CMAKE_GENERATOR MATCHES "Unix Makefiles")
-    message(
-        FATAL_ERROR
-        "This project is intended to be built with Unix Makefiles on a Unix system."
-    )
-endif()
-
 # Enable exporting compile commands
 set(CMAKE_EXPORT_COMPILE_COMMANDS
     ON

diff --git a/Taskfile.yml b/Taskfile.yml
@@ -138,7 +138,6 @@ tasks:
     deps: ["emsdk"]
     cmd: |-
       cmake \
-      -G "Unix Makefiles" \
       -DCMAKE_TOOLCHAIN_FILE="{{.G_EMSDK_DIR}}/upstream/emscripten/cmake/Modules/Platform/\
       Emscripten.cmake" \
       -S "{{.ROOT_DIR}}" \