From 29706a6bb4a50cbf186e39e3b7496d8f4f8ba1c8 Mon Sep 17 00:00:00 2001 From: Paul Walker Date: Thu, 21 Nov 2024 18:21:50 -0500 Subject: [PATCH] noodle --- .github/workflows/build-pr.yml | 22 ++++++++++++++++------ CMakeLists.txt | 4 +++- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 82e3b57..7dbf2e3 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -8,14 +8,24 @@ defaults: jobs: build_plugin: - name: PR - ${{ matrix.os }} + name: PR - ${{ matrix.name }} runs-on: ${{ matrix.os }} strategy: matrix: include: - - os: windows-latest - - os: macos-latest - - os: ubuntu-latest + - name: windows x64 + os: windows-latest + + - name: windows arm64ec + os: windows-latest + cmakeConfig: -G"Visual Studio 17 2022" -A arm64ec -DCMAKE_SYSTEM_VERSION=10 + + - name: macOS + os: macos-latest + cmakeConfig: -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" + + - name: Linux + os: ubuntu-latest steps: - name: Checkout code uses: actions/checkout@v4 @@ -29,7 +39,7 @@ jobs: - name: Build pull request version run: | - cmake -S . -B ./build -DCMAKE_BUILD_TYPE=Debug + cmake -S . -B ./build ${{ matrix.cmakeConfig }} -DCMAKE_BUILD_TYPE=Debug -DJI_LATTICE_COPY_AFTER_BUILD=FALSE cmake --build ./build --config Debug --target ji-lattice-plugin-installer --parallel 3 build_plugin_lindoc: @@ -47,7 +57,7 @@ jobs: image: ghcr.io/surge-synthesizer/sst-dockerimages/ubuntu20_gcc11:main username: ${{ github.actor }} token: ${{ secrets.GITHUB_TOKEN }} - cmakeArgs: -DCMAKE_BUILD_TYPE=Debug -GNinja + cmakeArgs: -DCMAKE_BUILD_TYPE=Debug -GNinja -DJI_LATTICE_COPY_AFTER_BUILD=FALSE target: ji-lattice-plugin-installer - name: Confirm Build diff --git a/CMakeLists.txt b/CMakeLists.txt index 454b296..ed28cee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,8 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden) set(CMAKE_VISIBILITY_INLINES_HIDDEN ON) set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) +option(JI_LATTICE_COPY_AFTER_BUILD "Copy the plugin after build" TRUE) + include (cmake/CPM.cmake) CPMAddPackage("gh:juce-framework/JUCE#8.0.4") @@ -27,7 +29,7 @@ juce_add_plugin(${PROJECT_NAME} FORMATS AU VST3 Standalone - COPY_PLUGIN_AFTER_BUILD TRUE + COPY_PLUGIN_AFTER_BUILD ${JI_LATTICE_COPY_AFTER_BUILD} ) juce_add_binary_data(lattices-binary