Skip to content

Commit b6516b1

Browse files
Make JUCE fetching optional. Build macOS universal only in CI. (#78)
* Build macOS universal in CI, but not by default * CMake: made internal JUCE fetching optional * Missing quote Co-authored-by: Eyal Amir <[email protected]>
1 parent 6436ce3 commit b6516b1

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777

7878
- name: Configure
7979
shell: bash
80-
run: cmake -B ${{ env.BUILD_DIR }} -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE}} -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache .
80+
run: cmake -B ${{ env.BUILD_DIR }} -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE}} -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" .
8181

8282
- name: Build
8383
shell: bash

CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,19 @@ if (APPLE)
77
# Target OS versions down to 10.11
88
set (CMAKE_OSX_DEPLOYMENT_TARGET "10.11" CACHE INTERNAL "")
99

10-
# Universal Binary
11-
set(CMAKE_OSX_ARCHITECTURES arm64 x86_64)
10+
# Uncomment to produce a universal binary
11+
# set(CMAKE_OSX_ARCHITECTURES arm64 x86_64)
1212
endif()
1313

1414
# Adds all the module sources so they appear correctly in the IDE
1515
set_property(GLOBAL PROPERTY USE_FOLDERS YES)
1616
option(JUCE_ENABLE_MODULE_SOURCE_GROUPS "Enable Module Source Groups" ON)
1717

18-
add_subdirectory(modules/juce)
18+
option(PLUGINVAL_FETCH_JUCE "Fetch JUCE along with PluginVal" ON)
19+
20+
if(PLUGINVAL_FETCH_JUCE)
21+
add_subdirectory(modules/juce)
22+
endif()
1923

2024
if (DEFINED ENV{VST2_SDK_DIR})
2125
MESSAGE(STATUS "Building with VST2 SDK: $ENV{VST2_SDK_DIR}")

0 commit comments

Comments
 (0)