Add CMake WASM target support, update CI workflows

olilarkin · olilarkin · commit e4c9204448ab · 2026-05-09T14:46:28.000+02:00
- Add WASM to CMakeLists.txt FORMATS
- Rename wam preset to web (matching upstream)
- Add cmake-based WASM build option to build-wasm.yml
- Add /ci wasm support to build-cmake.yml
diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml
@@ -30,6 +30,10 @@ on:
         description: 'Include WAM/Emscripten build'
         type: boolean
         default: false
+      wasm:
+        description: 'Include WASM/Emscripten build'
+        type: boolean
+        default: false
       universal:
         description: 'Include macOS Universal build (arm64+x86_64)'
         type: boolean
@@ -66,6 +70,7 @@ jobs:
       all_generators: ${{ steps.parse.outputs.all_generators }}
       ios: ${{ steps.parse.outputs.ios }}
       wam: ${{ steps.parse.outputs.wam }}
+      wasm: ${{ steps.parse.outputs.wasm }}
       universal: ${{ steps.parse.outputs.universal }}
       backends: ${{ steps.parse.outputs.backends }}
       arm64ec: ${{ steps.parse.outputs.arm64ec }}
@@ -86,13 +91,15 @@ jobs:
               echo "all_generators=true" >> $GITHUB_OUTPUT
               echo "ios=true" >> $GITHUB_OUTPUT
               echo "wam=true" >> $GITHUB_OUTPUT
+              echo "wasm=true" >> $GITHUB_OUTPUT
               echo "universal=true" >> $GITHUB_OUTPUT
               echo "backends=true" >> $GITHUB_OUTPUT
               echo "arm64ec=true" >> $GITHUB_OUTPUT
             else
               [[ "$COMMENT" == *"/ci all-generators"* || "$COMMENT" == *"/ci generators"* ]] && echo "all_generators=true" >> $GITHUB_OUTPUT || echo "all_generators=false" >> $GITHUB_OUTPUT
               [[ "$COMMENT" == *"/ci ios"* ]] && echo "ios=true" >> $GITHUB_OUTPUT || echo "ios=false" >> $GITHUB_OUTPUT
               [[ "$COMMENT" == *"/ci wam"* ]] && echo "wam=true" >> $GITHUB_OUTPUT || echo "wam=false" >> $GITHUB_OUTPUT
+              [[ "$COMMENT" == *"/ci wasm"* ]] && echo "wasm=true" >> $GITHUB_OUTPUT || echo "wasm=false" >> $GITHUB_OUTPUT
               [[ "$COMMENT" == *"/ci universal"* ]] && echo "universal=true" >> $GITHUB_OUTPUT || echo "universal=false" >> $GITHUB_OUTPUT
               [[ "$COMMENT" == *"/ci backends"* ]] && echo "backends=true" >> $GITHUB_OUTPUT || echo "backends=false" >> $GITHUB_OUTPUT
               [[ "$COMMENT" == *"/ci arm64ec"* ]] && echo "arm64ec=true" >> $GITHUB_OUTPUT || echo "arm64ec=false" >> $GITHUB_OUTPUT
@@ -102,6 +109,7 @@ jobs:
             echo "all_generators=${{ inputs.all_generators }}" >> $GITHUB_OUTPUT
             echo "ios=${{ inputs.ios }}" >> $GITHUB_OUTPUT
             echo "wam=${{ inputs.wam }}" >> $GITHUB_OUTPUT
+            echo "wasm=${{ inputs.wasm }}" >> $GITHUB_OUTPUT
             echo "universal=${{ inputs.universal }}" >> $GITHUB_OUTPUT
             echo "backends=${{ inputs.backends }}" >> $GITHUB_OUTPUT
             echo "arm64ec=${{ inputs.arm64ec }}" >> $GITHUB_OUTPUT
@@ -111,6 +119,7 @@ jobs:
             echo "all_generators=false" >> $GITHUB_OUTPUT
             echo "ios=false" >> $GITHUB_OUTPUT
             echo "wam=false" >> $GITHUB_OUTPUT
+            echo "wasm=false" >> $GITHUB_OUTPUT
             echo "universal=false" >> $GITHUB_OUTPUT
             echo "backends=false" >> $GITHUB_OUTPUT
             echo "arm64ec=false" >> $GITHUB_OUTPUT
@@ -700,21 +709,85 @@ jobs:
           ./download-iplug-sdks.sh
 
       - name: CMake Configure
-        run: cmake --preset=wam
+        run: cmake --preset=web
 
       - name: Build WAM
-        run: cmake --build --preset=wam
+        run: cmake --build --preset=web --target ${{env.PROJECT_NAME}}-web-dist
 
       - name: Verify WAM Output
         run: |
-          test -f build/wam/out/${{env.PROJECT_NAME}}/index.html
-          test -f build/wam/out/${{env.PROJECT_NAME}}/scripts/${{env.PROJECT_NAME}}-wam.js
-          test -f build/wam/out/${{env.PROJECT_NAME}}/scripts/${{env.PROJECT_NAME}}-web.js
-          test -f build/wam/out/${{env.PROJECT_NAME}}/scripts/${{env.PROJECT_NAME}}-web.wasm
+          test -f build/web/out/${{env.PROJECT_NAME}}/index.html
+          test -f build/web/out/${{env.PROJECT_NAME}}/scripts/${{env.PROJECT_NAME}}-wam.js
+          test -f build/web/out/${{env.PROJECT_NAME}}/scripts/${{env.PROJECT_NAME}}-web.js
+          test -f build/web/out/${{env.PROJECT_NAME}}/scripts/${{env.PROJECT_NAME}}-web.wasm
           echo "WAM distribution verified"
 
       - name: Upload WAM Artifact
         uses: actions/upload-artifact@v4
         with:
           name: ${{env.PROJECT_NAME}}-wam
-          path: build/wam/out/${{env.PROJECT_NAME}}
+          path: build/web/out/${{env.PROJECT_NAME}}
+
+  # ==========================================================================
+  # Emscripten - WASM Build - Optional: /ci wasm
+  # ==========================================================================
+  emscripten-wasm:
+    name: WASM (Emscripten)
+    needs: parse-commands
+    if: needs.parse-commands.outputs.wasm == 'true'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.parse-commands.outputs.pr_sha || github.sha }}
+          submodules: recursive
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+
+      - name: Setup Emscripten
+        uses: mymindstorm/setup-emsdk@v14
+
+      - name: Install Ninja
+        run: sudo apt-get install -y ninja-build
+
+      - name: Cache IPlug SDKs
+        id: cache-sdks
+        uses: actions/cache@v4
+        with:
+          path: |
+            iPlug2/Dependencies/IPlug/VST3_SDK
+            iPlug2/Dependencies/IPlug/CLAP_SDK
+            iPlug2/Dependencies/IPlug/CLAP_HELPERS
+          key: iplug-sdks-${{ hashFiles('iPlug2/Dependencies/IPlug/download-iplug-sdks.sh') }}
+
+      - name: Get SDKs
+        if: steps.cache-sdks.outputs.cache-hit != 'true'
+        run: |
+          cd iPlug2/Dependencies/IPlug
+          ./download-iplug-sdks.sh
+
+      - name: CMake Configure
+        run: cmake --preset=web
+
+      - name: Build WASM
+        run: cmake --build --preset=web --target ${{env.PROJECT_NAME}}-wasm-dist
+
+      - name: Verify WASM Output
+        run: |
+          test -f build/web/out/${{env.PROJECT_NAME}}/index.html
+          test -f build/web/out/${{env.PROJECT_NAME}}/scripts/${{env.PROJECT_NAME}}-dsp.js
+          test -f build/web/out/${{env.PROJECT_NAME}}/scripts/${{env.PROJECT_NAME}}-bundle.js
+          test -f build/web/out/${{env.PROJECT_NAME}}/scripts/${{env.PROJECT_NAME}}-processor.js
+          test -f build/web/out/${{env.PROJECT_NAME}}/styles/style.css
+          echo "WASM distribution verified"
+
+      - name: Upload WASM Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{env.PROJECT_NAME}}-wasm-cmake
+          path: build/web/out/
+          if-no-files-found: warn
diff --git a/.github/workflows/build-wasm.yml b/.github/workflows/build-wasm.yml
@@ -1,14 +1,24 @@
 name: Build Wasm
 
 on:
-  workflow_dispatch
+  workflow_dispatch:
+    inputs:
+      build_system:
+        description: 'Build system to use'
+        type: choice
+        options:
+          - makefile
+          - cmake
+          - both
+        default: makefile
 
 env:
   PROJECT_NAME: TemplateProject
 
 jobs:
-  build:
-    name: Build-Wasm
+  build-makefile:
+    name: Build-Wasm (Makefile)
+    if: inputs.build_system != 'cmake'
     runs-on: ubuntu-latest
 
     steps:
@@ -33,6 +43,14 @@ jobs:
           cd ${{env.PROJECT_NAME}}/scripts
           ./makedist-wasm.sh off
 
+      - name: Verify WASM Output
+        run: |
+          test -f ${{env.PROJECT_NAME}}/build-web-wasm/index.html
+          test -f ${{env.PROJECT_NAME}}/build-web-wasm/scripts/${{env.PROJECT_NAME}}-dsp.js
+          test -f ${{env.PROJECT_NAME}}/build-web-wasm/scripts/${{env.PROJECT_NAME}}-bundle.js
+          test -f ${{env.PROJECT_NAME}}/build-web-wasm/scripts/${{env.PROJECT_NAME}}-processor.js
+          echo "WASM distribution verified"
+
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
@@ -45,3 +63,50 @@ jobs:
           token: ${{secrets.GITHUB_TOKEN}}
           branch: gh-pages
           folder: ${{env.PROJECT_NAME}}/build-web-wasm
+
+  build-cmake:
+    name: Build-Wasm (CMake)
+    if: inputs.build_system != 'makefile'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          persist-credentials: false
+
+      - name: Setup Python 3
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+
+      - name: Setup Emscripten
+        uses: mymindstorm/setup-emsdk@v14
+        with:
+          actions-cache-folder: 'emsdk-cache'
+
+      - name: Install Ninja
+        run: sudo apt-get install -y ninja-build
+
+      - name: Configure CMake
+        run: cmake --preset web
+
+      - name: Build
+        run: cmake --build --preset web --target ${{env.PROJECT_NAME}}-wasm-dist
+
+      - name: Verify WASM Output
+        run: |
+          test -f build/web/out/${{env.PROJECT_NAME}}/index.html
+          test -f build/web/out/${{env.PROJECT_NAME}}/scripts/${{env.PROJECT_NAME}}-dsp.js
+          test -f build/web/out/${{env.PROJECT_NAME}}/scripts/${{env.PROJECT_NAME}}-bundle.js
+          test -f build/web/out/${{env.PROJECT_NAME}}/scripts/${{env.PROJECT_NAME}}-processor.js
+          test -f build/web/out/${{env.PROJECT_NAME}}/styles/style.css
+          echo "WASM distribution verified"
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{env.PROJECT_NAME}}-wasm-cmake
+          path: build/web/out/
+          if-no-files-found: warn
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -166,9 +166,9 @@
       }
     },
     {
-      "name": "wam",
-      "displayName": "WAM (Emscripten)",
-      "description": "Web Audio Module build with Emscripten/WebAssembly",
+      "name": "web",
+      "displayName": "Web (Emscripten)",
+      "description": "Web build with Emscripten/WebAssembly (WAM + WASM)",
       "inherits": "base",
       "generator": "Ninja",
       "toolchainFile": "$env{EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake",
@@ -247,8 +247,8 @@
       "configuration": "Release"
     },
     {
-      "name": "wam",
-      "configurePreset": "wam"
+      "name": "web",
+      "configurePreset": "web"
     }
   ]
 }
diff --git a/TemplateProject/CMakeLists.txt b/TemplateProject/CMakeLists.txt
@@ -1,7 +1,10 @@
 cmake_minimum_required(VERSION 3.25)
 project(TemplateProject VERSION 1.0.0)
 
-set(IPLUG2_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../iPlug2 CACHE PATH "iPlug2 root directory")
+if(NOT DEFINED IPLUG2_DIR)
+  set(IPLUG2_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../iPlug2" CACHE PATH "iPlug2 root directory")
+endif()
+
 include(${IPLUG2_DIR}/iPlug2.cmake)
 
 find_package(iPlug2 REQUIRED)
@@ -14,5 +17,5 @@ iplug_add_plugin(${PROJECT_NAME}
   RESOURCES
     resources/fonts/Roboto-Regular.ttf
   FORMATS
-    MINIMAL_PLUGINS APP
+    MINIMAL_PLUGINS APP WASM
 )

Original file line number	Diff line number	Diff line change
`@@ -166,9 +166,9 @@`
`166`	`166`	`}`
`167`	`167`	`},`
`168`	`168`	`{`
`169`		`- "name": "wam",`
`170`		`- "displayName": "WAM (Emscripten)",`
`171`		`- "description": "Web Audio Module build with Emscripten/WebAssembly",`
	`169`	`+ "name": "web",`
	`170`	`+ "displayName": "Web (Emscripten)",`
	`171`	`+ "description": "Web build with Emscripten/WebAssembly (WAM + WASM)",`
`172`	`172`	`"inherits": "base",`
`173`	`173`	`"generator": "Ninja",`
`174`	`174`	`"toolchainFile": "$env{EMSDK}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake",`
`@@ -247,8 +247,8 @@`
`247`	`247`	`"configuration": "Release"`
`248`	`248`	`},`
`249`	`249`	`{`
`250`		`- "name": "wam",`
`251`		`- "configurePreset": "wam"`
	`250`	`+ "name": "web",`
	`251`	`+ "configurePreset": "web"`
`252`	`252`	`}`
`253`	`253`	`]`
`254`	`254`	`}`