mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 11:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix cpack absolute paths (SDK)

Browse source 
Fix mac build (CI)
This commit is contained in:
Julien Wadel 2023-08-22 11:58:30 +02:00
parent d967af18dd
commit 7fa33b26d7
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitlab-ci-files/job-macosx-desktop.yml
View file

@ -18,7 +18,7 @@
echo $DEFAULT_MACOS_CMAKE_OPTIONS
echo $CMAKE_OPTIONS
echo $ADDITIONAL_BUILD_OPTIONS
cmake .. -G "$CMAKE_GENERATOR" -DLINPHONESDK_PLATFORM=Macos -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE $DEFAULT_MACOS_CMAKE_OPTIONS $XCODE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS -DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_FILE -DCMAKE_APPLE_SILICON_PROCESSOR=$CMAKE_APPLE_SILICON_PROCESSOR $RELEASE_FILE
cmake .. -G "$CMAKE_GENERATOR" -DLINPHONESDK_PLATFORM=Macos -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE $DEFAULT_MACOS_CMAKE_OPTIONS $XCODE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS -DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_FILE $RELEASE_FILE
cmake --build . --target install --config $CI_BUILD_TYPE $LBC_NODEBUG_OPTIONS -- $ADDITIONAL_BUILD_OPTIONS
ccache -s
@ -29,7 +29,6 @@
- *build_all_script
variables:
CMAKE_TOOLCHAIN_FILE: linphone-sdk/cmake/toolchains/toolchain-mac-x86_64.cmake
CMAKE_APPLE_SILICON_PROCESSOR: x86_64
artifacts:
paths:
- build/OUTPUT

2
linphone-sdk

@ -1 +1 @@
Subproject commit 6b6f905377c2a07c3086be3049d8bb227848eed3
Subproject commit f3ce7e6ae9cb00c609bd2c4b5c983a3b10e75e02