update sdk
fix macos build
This commit is contained in:
parent
a2c0bfe558
commit
d4871560bf
2 changed files with 3 additions and 3 deletions
|
|
@ -48,7 +48,7 @@ macosx-ninja:
|
||||||
- if: ($CI_PIPELINE_SOURCE == "merge_request_event") && $DOCKER_UPDATE == null && $SKIP_MACOSX == null
|
- if: ($CI_PIPELINE_SOURCE == "merge_request_event") && $DOCKER_UPDATE == null && $SKIP_MACOSX == null
|
||||||
variables:
|
variables:
|
||||||
CMAKE_GENERATOR: Ninja
|
CMAKE_GENERATOR: Ninja
|
||||||
CMAKE_OPTIONS: -DENABLE_PQCRYPTO=OFF
|
CMAKE_OPTIONS: -DPython3_ROOT_DIR=/opt/bc/pip-packages/ -DENABLE_PQCRYPTO=OFF
|
||||||
extends: .macosx-desktop
|
extends: .macosx-desktop
|
||||||
|
|
||||||
#################################################
|
#################################################
|
||||||
|
|
@ -62,7 +62,7 @@ macosx-makefile:
|
||||||
- if: $DEPLOY_PLUGINS
|
- if: $DEPLOY_PLUGINS
|
||||||
variables:
|
variables:
|
||||||
CMAKE_GENERATOR: Unix Makefiles
|
CMAKE_GENERATOR: Unix Makefiles
|
||||||
CMAKE_OPTIONS: -DENABLE_PQCRYPTO=OFF
|
CMAKE_OPTIONS: -DPython3_ROOT_DIR=/opt/bc/pip-packages/ -DENABLE_PQCRYPTO=OFF
|
||||||
ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS
|
ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS
|
||||||
extends: .macosx-desktop
|
extends: .macosx-desktop
|
||||||
|
|
||||||
|
|
|
||||||
2
external/linphone-sdk
vendored
2
external/linphone-sdk
vendored
|
|
@ -1 +1 @@
|
||||||
Subproject commit 005659fdce0976bb1ac6f899e3d05155c14bc4e4
|
Subproject commit 40804e3c8d3059375397b396a45d9f128b766122
|
||||||
Loading…
Reference in a new issue