brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Deal with homebrew cmake injecting OSX SYSROOT

Browse source
This commit is contained in:
falkTX 2022-07-22 15:04:38 +01:00
parent 79cffd2d8e
commit 12427f5ed7
2 changed files with 39 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

62
.github/workflows/build.yml vendored
View file

@ -443,22 +443,22 @@ jobs:
pushd deps/PawPaw; source local.env macos; popd pushd deps/PawPaw; source local.env macos; popd
make features make features
make CIBUILD=true NOOPT=true WITH_LTO=true -j $(sysctl -n hw.logicalcpu) make CIBUILD=true NOOPT=true WITH_LTO=true -j $(sysctl -n hw.logicalcpu)
#- name: Build macOS intel (AU using juce) - name: Build macOS intel (AU using juce)
#env: env:
#MACOSX_DEPLOYMENT_TARGET: '10.8' MACOSX_DEPLOYMENT_TARGET: '10.8'
#run: | run: |
#pushd deps/PawPaw; source local.env macos; popd pushd deps/PawPaw; source local.env macos; popd
#git clone --depth=1 -b 6.1.6 https://github.com/juce-framework/JUCE.git jucewrapper/JUCE git clone --depth=1 -b 6.1.6 https://github.com/juce-framework/JUCE.git jucewrapper/JUCE
#sed -i -e 's/kAudioUnitProperty_SupportsMPE/kAudioUnitProperty_ignore_SupportsMPE/' jucewrapper/JUCE/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.h sed -i -e 's/kAudioUnitProperty_SupportsMPE/kAudioUnitProperty_ignore_SupportsMPE/' jucewrapper/JUCE/modules/juce_audio_processors/format_types/juce_AudioUnitPluginFormat.h
#mkdir -p jucewrapper/build mkdir -p jucewrapper/build
#pushd jucewrapper/build; cmake -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.8 -DCMAKE_OSX_SYSROOT=${PAWPAW_PREFIX} -DCMAKE_BUILD_TYPE=Release .. && make VERBOSE=1 -j $(sysctl -n hw.logicalcpu); popd pushd jucewrapper/build; cmake -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.8 -DCMAKE_OSX_SYSROOT=$(xcrun --sdk macosx --show-sdk-path) -DCMAKE_BUILD_TYPE=Release .. && make VERBOSE=1 -j $(sysctl -n hw.logicalcpu); popd
#mv jucewrapper/build/*_artefacts/Release/AU/*.component bin/ mv jucewrapper/build/*_artefacts/Release/AU/*.component bin/
#- name: Build macOS intel (packaging) - name: Build macOS intel (packaging)
#env: env:
#MACOS_ARCHS: 'x86_64' MACOS_ARCHS: 'x86_64'
#run: | run: |
#pushd deps/PawPaw; source local.env macos; popd pushd deps/PawPaw; source local.env macos; popd
#./utils/create-macos-installer.sh ./utils/create-macos-installer.sh
- name: Set sha8 (non-release) - name: Set sha8 (non-release)
if: startsWith(github.ref, 'refs/tags/') != true if: startsWith(github.ref, 'refs/tags/') != true
id: slug1 id: slug1
@ -533,21 +533,21 @@ jobs:
pushd deps/PawPaw; source local.env macos-universal; popd pushd deps/PawPaw; source local.env macos-universal; popd
make features make features
make CIBUILD=true NOOPT=true WITH_LTO=true -j $(sysctl -n hw.logicalcpu) make CIBUILD=true NOOPT=true WITH_LTO=true -j $(sysctl -n hw.logicalcpu)
#- name: Build macOS universal (AU using juce) - name: Build macOS universal (AU using juce)
#env: env:
#MACOSX_DEPLOYMENT_TARGET: '10.12' MACOSX_DEPLOYMENT_TARGET: '10.12'
#run: | run: |
#pushd deps/PawPaw; source local.env macos-universal; popd pushd deps/PawPaw; source local.env macos-universal; popd
#git clone --depth=1 -b 6.1.6 https://github.com/juce-framework/JUCE.git jucewrapper/JUCE git clone --depth=1 -b 6.1.6 https://github.com/juce-framework/JUCE.git jucewrapper/JUCE
#mkdir -p jucewrapper/build mkdir -p jucewrapper/build
#pushd jucewrapper/build; cmake -DCMAKE_OSX_ARCHITECTURES='arm64;x86_64' -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DCMAKE_OSX_SYSROOT=${PAWPAW_PREFIX} -DCMAKE_BUILD_TYPE=Release .. && make VERBOSE=1 -j $(sysctl -n hw.logicalcpu); popd pushd jucewrapper/build; cmake -DCMAKE_OSX_ARCHITECTURES='arm64;x86_64' -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DCMAKE_OSX_SYSROOT=$(xcrun --sdk macosx --show-sdk-path) -DCMAKE_BUILD_TYPE=Release .. && make VERBOSE=1 -j $(sysctl -n hw.logicalcpu); popd
#mv jucewrapper/build/*_artefacts/Release/AU/*.component bin/ mv jucewrapper/build/*_artefacts/Release/AU/*.component bin/
#- name: Build macOS universal (packaging) - name: Build macOS universal (packaging)
#env: env:
#MACOS_ARCHS: 'arm64,x86_64' MACOS_ARCHS: 'arm64,x86_64'
#run: | run: |
#pushd deps/PawPaw; source local.env macos-universal; popd pushd deps/PawPaw; source local.env macos-universal; popd
#./utils/create-macos-installer.sh ./utils/create-macos-installer.sh
- name: Set sha8 (non-release) - name: Set sha8 (non-release)
if: startsWith(github.ref, 'refs/tags/') != true if: startsWith(github.ref, 'refs/tags/') != true
id: slug1 id: slug1

15
deps/Makefile vendored
View file

@ -111,6 +111,13 @@ CMAKE += -DCMAKE_INSTALL_LIBDIR=lib
CMAKE += -DCMAKE_INSTALL_PREFIX='$(DEP_PATH)' CMAKE += -DCMAKE_INSTALL_PREFIX='$(DEP_PATH)'
CMAKE += -DBUILD_SHARED_LIBS=OFF CMAKE += -DBUILD_SHARED_LIBS=OFF
# make sure debug/release matches
ifeq ($(DEBUG),true)
CMAKE += -DCMAKE_BUILD_TYPE=Debug
else
CMAKE += -DCMAKE_BUILD_TYPE=Release
endif
# make sure macOS target matches ours # make sure macOS target matches ours
ifeq ($(MACOS),true) ifeq ($(MACOS),true)
ifneq (,$(findstring -arch$(SPACE),$(CXXFLAGS))) ifneq (,$(findstring -arch$(SPACE),$(CXXFLAGS)))
@ -124,13 +131,7 @@ CMAKE += -DCMAKE_OSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET)
else ifeq ($(CIBUILD),true) else ifeq ($(CIBUILD),true)
$(error CI build requires -mmacosx-version-min flag on macOS) $(error CI build requires -mmacosx-version-min flag on macOS)
endif endif
endif CMAKE += -DCMAKE_OSX_SYSROOT=$(shell xcrun --sdk macosx --show-sdk-path)
# make sure debug/release matches
ifeq ($(DEBUG),true)
CMAKE += -DCMAKE_BUILD_TYPE=Debug
else
CMAKE += -DCMAKE_BUILD_TYPE=Release
endif endif
# fix cross-compilation for windows # fix cross-compilation for windows