Skip to content

Commit 2a315d4

Browse files
committed
CI libajantv2 macOS fix
CMAKE_OSX_SYSROOT is empty by default since CMake 4 [1] so make a workaround MSCOS_SDK_VERSION_MAJOR and _MINOR seems to be unused but are derived from MACOS_SDK_VERSION which is conversly derived from MACOS_SDK_NAME, which can be now eg. /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk (`xcrun --sdk macosx --show-sdk-path`) - not containing the version string in expected form. [1]: https://cmake.org/cmake/help/latest/variable/CMAKE_OSX_SYSROOT.html
1 parent 95180fa commit 2a315d4

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

.github/scripts/install-common-deps.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,13 @@ download_install_cineform() {(
3636

3737
download_build_aja() {
3838
git clone --depth 1 https://github.com/aja-video/libajantv2.git
39-
# TODO TOREMOVE this workaround when not needed
39+
# TODO TOREMOVE this workarounds when not needed
4040
tr -d '\n' < libajantv2/VERSION.txt > ver-fix-no-NL$$.txt &&
4141
mv ver-fix-no-NL$$.txt libajantv2/VERSION.txt
42+
sed -i -e '/MACOS_SDK_VERSION/d' libajantv2/cmake/CMakeOptions.cmake &&
43+
SDKROOT=$(xcrun --sdk macosx --show-sdk-path) && export SDKROOT
4244
export MACOSX_DEPLOYMENT_TARGET=10.13 # needed for arm64 mac
45+
4346
cmake -DAJANTV2_DISABLE_DEMOS=ON -DAJANTV2_DISABLE_DRIVER=ON \
4447
-DAJANTV2_DISABLE_TOOLS=ON -DAJANTV2_DISABLE_TESTS=ON \
4548
-DAJANTV2_DISABLE_PLUGIN_LOAD=ON -DAJANTV2_BUILD_SHARED=ON \

0 commit comments

Comments
 (0)