Switch from makefiles to cmake

QuantStack · ianthomas23 · Jan 9, 2026 · Oct 23, 2025 · Nov 27, 2025 · Dec 12, 2025
commit ec1eeb4856865c51e2a33ae0a6b11c964aa0202b
diff --git a/wasm/.gitignore b/wasm/.gitignore
@@ -1,2 +1,14 @@
-serve/cockle/
-serve/lite/
+CMakeCache.txt
+CMakeFiles/
+Makefile
+cmake_install.cmake
+cockle-config.json
+cockle_wasm_env/
+node_modules/
+package-lock.json
+.jupyterlite.doit.db
+
+recipe/em-forge-recipes/
+serve/*/
+test/assets/*/
+test/lib/
diff --git a/wasm/CMakeLists.txt b/wasm/CMakeLists.txt
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.28)
+project(git2cpp-wasm)
+
+add_subdirectory(recipe)
+add_subdirectory(cockle-deploy)
+add_subdirectory(lite-deploy)
+add_subdirectory(test)
+
+# Build everything (package, cockle and lite deployments, tests).
+add_custom_target(build ALL DEPENDS build-recipe build-cockle build-lite build-test)
+
+# Rebuild after change in C++ code.
+add_custom_target(rebuild DEPENDS rebuild-recipe rebuild-cockle rebuild-lite rebuild-test)
+
+# Serve both cockle and JupyterLite deployments.
+add_custom_target(serve COMMAND npx static-handler --cors --coop --coep --corp serve)
diff --git a/wasm/Makefile b/wasm/Makefile
diff --git a/wasm/README.md b/wasm/README.md
@@ -10,7 +10,7 @@ It works on Linux and macOS but not Windows.
 
 There are 5 sub-directories:
 
-- `build`: build local `git2cpp` source code into an Emscripten-forge package.
+- `recipe`: build local `git2cpp` source code into an Emscripten-forge package.
 - `cockle-deploy`: create a `cockle` deployment in the `serve` directory.
 - `lite-deploy`: create a JupyterLite `terminal` deployment in the `serve` directory.
 - `serve`: where the two deployments are served from.
@@ -29,9 +29,13 @@ micromamba activate git2cpp-wasm
 Then to build the WebAssembly package, both deployments and the testing resources use:
 
 ```bash
+cmake .
 make
 ```
 
+The built emscripten-forge package will be file named something like `git2cpp-0.0.5-h7223423_1.tar.bz2`
+in the directory `recipe/em-force-recipes/output/emscripten-wasm32`.
+
 The local deployments in the `serve` directory can be manually checked using:
 
 ```bash
@@ -58,7 +62,13 @@ make test
 ```
 
 This runs (some of) the tests in the top-level `test` directory with various monkey patching so that
-`git2cpp` commands are executed in the browser.
+`git2cpp` commands are executed in the browser. If there are problems running the tests then ensure
+you have the latest `playwright` browser installed:
+
+
+```bash
+playwright install chromium
+```
 
 ## Rebuild
 

diff --git a/wasm/build/.gitignore b/wasm/build/.gitignore
diff --git a/wasm/build/Makefile b/wasm/build/Makefile
diff --git a/wasm/cockle-deploy/.gitignore b/wasm/cockle-deploy/.gitignore
diff --git a/wasm/cockle-deploy/CMakeLists.txt b/wasm/cockle-deploy/CMakeLists.txt
@@ -0,0 +1,21 @@
+cmake_minimum_required(VERSION 3.28)
+project(git2cpp-wasm-cockle-deploy)
+
+include("../common.cmake")
+
+set(SERVE_DIR "../serve/cockle")
+
+add_custom_target(build-cockle
+    DEPENDS build-recipe
+    COMMAND npm install
+    COMMAND COCKLE_WASM_EXTRA_CHANNEL=${BUILT_PACKAGE_DIR} npm run build
+    BYPRODUCTS cockle_wasm_env node_modules ${SERVE_DIR}
+)
+
+add_custom_target(rebuild-cockle
+    DEPENDS rebuild-recipe clean-env-cockle build-cockle
+)
+
+add_custom_target(clean-env-cockle
+    COMMAND ${CMAKE_COMMAND} -E remove_directory cockle_wasm_env
+)
diff --git a/wasm/cockle-deploy/Makefile b/wasm/cockle-deploy/Makefile
diff --git a/wasm/common.cmake b/wasm/common.cmake
@@ -0,0 +1,8 @@
+# Emscripten-forge recipes directory relative to 'recipe' directory
+set(EM_FORGE_RECIPES_DIR "em-forge-recipes")
+
+# Output directory for built emscripten-forge packages relative to EM_FORGE_RECIPES_DIR
+set(BUILT_PACKAGE_SUBDIR "output")
+
+# Output directory for built emscripten-forge packages relative to subdirectories of this directory
+set(BUILT_PACKAGE_DIR "../recipe/${EM_FORGE_RECIPES_DIR}/${BUILT_PACKAGE_SUBDIR}")
diff --git a/wasm/common.mk b/wasm/common.mk
diff --git a/wasm/lite-deploy/.gitignore b/wasm/lite-deploy/.gitignore
diff --git a/wasm/lite-deploy/CMakeLists.txt b/wasm/lite-deploy/CMakeLists.txt
@@ -0,0 +1,21 @@
+cmake_minimum_required(VERSION 3.28)
+project(git2cpp-wasm-lite-deploy)
+
+include("../common.cmake")
+
+set(SERVE_DIR "../serve/lite")
+
+add_custom_target(build-lite
+    DEPENDS build-recipe
+    COMMAND jupyter lite --version
+    COMMAND COCKLE_WASM_EXTRA_CHANNEL=${BUILT_PACKAGE_DIR} jupyter lite build --output-dir ${SERVE_DIR}
+    BYPRODUCTS cockle-config.json .cockle_temp/ .jupyterlite.doit.db cockle_wasm_env/ ${SERVE_DIR}
+)
+
+add_custom_target(rebuild-lite
+    DEPENDS rebuild-recipe clean-env-lite build-lite
+)
+
+add_custom_target(clean-env-lite
+    COMMAND ${CMAKE_COMMAND} -E remove_directory cockle_wasm_env
+)
diff --git a/wasm/lite-deploy/Makefile b/wasm/lite-deploy/Makefile
diff --git a/wasm/recipe/CMakeLists.txt b/wasm/recipe/CMakeLists.txt
@@ -0,0 +1,43 @@
+cmake_minimum_required(VERSION 3.28)
+project(git2cpp-wasm-recipe)
+
+include("../common.cmake")
+
+set(EM_FORGE_RECIPES_REPO "https://github.com/emscripten-forge/recipes")
+set(GIT2CPP_RECIPE_DIR "recipes/recipes_emscripten/git2cpp")
+set(RATTLER_ARGS "--package-format tar-bz2 --target-platform emscripten-wasm32 -c https://repo.prefix.dev/emscripten-forge-dev -c microsoft -c conda-forge")
+
+# Only want the git2cpp recipe from emscripten-forge/recipes repo, not the whole repo.
+# Note removing the .git directory otherwise `git clean -fxd` will not remove the directory.
+add_custom_command(
+    OUTPUT ${EM_FORGE_RECIPES_DIR}
+    COMMAND git clone --no-checkout ${EM_FORGE_RECIPES_REPO} --depth 1 ${EM_FORGE_RECIPES_DIR}
+	COMMAND cd ${EM_FORGE_RECIPES_DIR} && git sparse-checkout init
+	COMMAND cd ${EM_FORGE_RECIPES_DIR} && git sparse-checkout set ${GIT2CPP_RECIPE_DIR}
+	COMMAND cd ${EM_FORGE_RECIPES_DIR} && git checkout main
+    COMMAND ${CMAKE_COMMAND} -E remove_directory ${EM_FORGE_RECIPES_DIR}/.git
+)
+
+add_custom_target(modify-recipe
+    DEPENDS ${EM_FORGE_RECIPES_DIR}
+    COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/modify-recipe.py ${GIT2CPP_RECIPE_DIR}
+    WORKING_DIRECTORY ${EM_FORGE_RECIPES_DIR}
+)
+
+add_custom_command(
+    OUTPUT ${EM_FORGE_RECIPES_DIR}/${BUILT_PACKAGE_SUBDIR}
+    DEPENDS modify-recipe
+    COMMAND bash -c "rattler-build build ${RATTLER_ARGS} --recipe ${GIT2CPP_RECIPE_DIR}"
+    WORKING_DIRECTORY ${EM_FORGE_RECIPES_DIR}
+)
+
+add_custom_target(build-recipe
+    DEPENDS ${EM_FORGE_RECIPES_DIR}/${BUILT_PACKAGE_SUBDIR}
+    WORKING_DIRECTORY ${EM_FORGE_RECIPES_DIR}
+)
+
+add_custom_target(rebuild-recipe DEPENDS clean-output-dir build-recipe)
+
+add_custom_target(clean-output-dir
+    COMMAND ${CMAKE_COMMAND} -E remove_directory ${EM_FORGE_RECIPES_DIR}/${BUILT_PACKAGE_SUBDIR}
+)
diff --git a/wasm/build/modify-recipe.py → wasm/recipe/modify-recipe.py b/wasm/build/modify-recipe.py → wasm/recipe/modify-recipe.py
diff --git a/wasm/test/.gitignore b/wasm/test/.gitignore
diff --git a/wasm/test/CMakeLists.txt b/wasm/test/CMakeLists.txt
@@ -0,0 +1,25 @@
+cmake_minimum_required(VERSION 3.28)
+project(git2cpp-wasm-test)
+
+include("../common.cmake")
+
+add_custom_target(build-test
+    DEPENDS build-recipe
+    COMMAND npm install
+    COMMAND COCKLE_WASM_EXTRA_CHANNEL=${BUILT_PACKAGE_DIR} npm run build
+    BYPRODUCTS cockle_wasm_env lib node_modules
+)
+
+add_custom_target(rebuild-test
+    DEPENDS rebuild-recipe clean-env-test build-test
+)
+
+add_custom_target(test
+	# A pytest fixture ensures that `npm run serve` runs for the duration of the tests.
+    COMMAND GIT2CPP_TEST_WASM=1 pytest -v -rP test_git.py
+    WORKING_DIRECTORY ../../test
+)
+
+add_custom_target(clean-env-test
+    COMMAND ${CMAKE_COMMAND} -E remove_directory cockle_wasm_env
+)
diff --git a/wasm/test/Makefile b/wasm/test/Makefile
diff --git a/wasm/wasm-environment.yml b/wasm/wasm-environment.yml
@@ -7,6 +7,7 @@ dependencies:
   - python
   - pyyaml
   # To build emscripten-forge recipe
+  - cmake
   - micromamba
   - rattler-build
   # For JupyterLite deployment