Skip to content
GitLab
Commit 16283c62 authored by Julien Wadel's avatar Julien Wadel
Browse files

Fix configuration propagation to liblinphone and ZXing ios build/dependencies.

parent 6f940f47
master deleteme feat/auto-extract-nix-version-from-submodule-src feature/5.2_add_tunnel_and_pq_tests_on_mr feature/AEC-tests feature/AEC3 feature/CI_performance_tuning feature/add-ekt-tests-report feature/add-security-alert-param feature/allow-raw-mwi-notification feature/android_ndk_26 feature/audio-conference-package feature/bundled-android-sdk feature/conference_max_minatures feature/fec feature/fec_adaptation feature/fec_bandwidth_analysis feature/job_launch_test_another_machine feature/lime_status_by_uri feature/media_encryption_settings_on_account feature/medialess feature/nix-flake feature/public_spm_ci feature/python_wheel_macos_ci_job feature/python_wrapper_5.3 feature/remove_unwatched_testers feature/rfc_9078 feature/rtp_stats_5.4 feature/screensharing_packet_router feature/screensharing_signalling feature/spm feature/swift_push_unit_tests feature/test-new-ccmp-deployment feature/tests-with-sanitizer feature/to-delete-compile-last-wrapper feature/ubuntu_1804_test feature/unitTestInCpp feature/update-debian-10-11-12-images feature/use_xcode14_and_15 feature/vs2019_windows_ci feature/vs2019_windows_ci_52 fix/5_3_xcode15_build fix/add_debug_logs fix/address_storage fix/alerts fix/android_ringtone_player_stop_5.3 fix/android_window fix/audio_codec_debug fix/audio_routes fix/broadcast_flexisip fix/build-without-glu-header-file fix/bundle_mode_fix fix/call_history_after_core_stop fix/ccmp_conference_description_master fix/chat_lesage_local_address_no_contact fix/chat_room_null_conference_address fix/cmake_sdk_target fix/compilation-ios fix/conf_unschedule_video fix/conference_called_after_joining_5_3 fix/conference_with_all_listeners fix/conference_without_bundle_mode fix/crash_e2e_unscheuled_conf fix/crash_terminate fix/database fix/db_friend_list_fix fix/didUpdatePushCredentials_debug_investigation fix/disable_ios_build fix/disable_rasperry_builds fix/double_invite fix/empty_authinfo fix/encrypted_chat_subscription_failed fix/encrypted_conference fix/encryption-changed-callback fix/factorize_sdk_minimal_size fix/fec-clean-log fix/flexi_api fix/flexisip-tester-2.3 fix/friend_lists fix/from_header fix/import-from-legacy-db fix/ios_builds_5_2 fix/ios_foreground_push_incoming_received fix/ios_shared_core_reactions fix/itc-misuse fix/java_jni_wrapper fix/jvm_cpp_wrapper_on_android fix/keep_centos7_build_only_5_2 fix/liblinphone_tester_new_runner_not_working fix/long_allure_history_find_placebo fix/mandatory_encryption fix/master_fake fix/message_not_sent_rework fix/missing-windows-dll-in-nuget fix/netsync-device fix/no-longer-use-deprecated-findpythoninterp-cmake-module fix/null_pointer_expcetion fix/opengl_dependencies fix/participant_video_no_conf_event_pkg fix/paused_by_remote_no_rtp_timeout_master fix/plugin_timeout fix/pre_mbe_dtls3.6.1_with_belle_sip_loop_fix fix/prevent-std-mutex-lock-crashes-on-windows fix/preview_id_lost fix/printf-format-causing-errors-when-building-for-yocto fix/python_build_macos fix/qt_crash fix/remote-address-adaptation fix/retry_after fix/rtt_message fix/runtime_errors fix/schedule_run fix/set_ios_macos_ccache_directory_by_branche fix/setlocale_utf8 fix/soci_cpp17 fix/srtp_key_length fix/startup_restart fix/stream-deletion fix/stream_allocation_no_label fix/subject_not_changed fix/switch_data_sync_to_short_service fix/tag_5_3_10 fix/test fix/test_flexiapi_backport fix/tone-indications fix/transfer_state fix/tunnel_deadlock fix/tunnel_packaging fix/tunnel_tester fix/ubuntu_glew_find_package_wrong_so_version fix/unsubscribe_upon_core_stop fix/update-check fix/video-conference-ssrc-changed fix/video_refused fix/wasapi_timestamp fix/webrtc-ice fix/xcode15_build fix/yocto hotfix/lime-db-path release/5.2 release/5.3 release/5.4 revert-09629a58 temp/check_update_python3.10_mac_m1 test/5.2_workload_temp_shuttle_monster_replacement test/ansible test/call_no_routes test/deploy_runner_tag_issue test/flexisip-release-candidate-2-4 test/flexisip_b2bua_h264 test/msvc_cache test/windows_rack_build test/windows_rack_build_vs2019 test/workload_temp_shuttle_monster_replacement tests/build_windows tests/build_windows_ansible update/openldap 5.5.0-alpha 5.4.0 5.4.0-beta 5.4.0-alpha 5.3.106 5.3.105 5.3.104 5.3.103 5.3.102 5.3.101 5.3.100 5.3.99 5.3.98 5.3.97 5.3.96 5.3.95 5.3.94 5.3.93 5.3.92 5.3.91 5.3.90 5.3.89 5.3.88 5.3.87 5.3.86 5.3.85 5.3.84 5.3.83 5.3.82 5.3.81 5.3.80 5.3.79 5.3.78 5.3.77 5.3.76 5.3.75 5.3.74 5.3.73 5.3.72 5.3.71 5.3.70 5.3.69 5.3.68 5.3.67 5.3.66 5.3.65 5.3.64 5.3.63 5.3.62 5.3.61 5.3.60 5.3.59 5.3.58 5.3.57 5.3.56 5.3.55 5.3.54 5.3.53 5.3.52 5.3.51 5.3.50 5.3.49 5.3.48 5.3.47 5.3.46 5.3.45 5.3.44 5.3.43 5.3.42 5.3.41 5.3.40 5.3.39 5.3.38 5.3.37 5.3.36 5.3.35 5.3.34 5.3.33 5.3.32 5.3.31 5.3.30 5.3.29 5.3.28 5.3.27 5.3.26 5.3.25 5.3.24 5.3.23 5.3.22 5.3.21 5.3.20 5.3.19 5.3.18 5.3.17 5.3.16 5.3.15 5.3.14 5.3.13 5.3.12 5.3.11 5.3.10 5.3.9 5.3.8 5.3.7 5.3.6 5.3.5 5.3.4 5.3.3 5.3.2 5.3.1 5.3.0 5.3.0-beta 5.3.0-alpha 5.2.114 5.2.113 5.2.112 5.2.111 5.2.110 5.2.109 5.2.108 5.2.107 5.2.106 5.2.105 5.2.104 5.2.103 5.2.102 5.2.101 5.2.100 5.2.99 5.2.98 5.2.97 5.2.96 5.2.95 5.2.94 5.2.93 5.2.92 5.2.91 5.2.90 5.2.89 5.2.88 5.2.87 5.2.86 5.2.85 5.2.84 5.2.83 5.2.82 5.2.81 5.2.80 5.2.79 5.2.78 5.2.77 5.2.76 5.2.75 5.2.74 5.2.73 5.2.72 5.2.71 5.2.70 5.2.69 5.2.68 5.2.67 5.2.66 5.2.65 5.2.64 5.2.63 5.2.62 5.2.61 5.2.60 5.2.59 5.2.58 5.2.57 5.2.56 5.2.55 5.2.54 5.2.53 5.2.52 5.2.51 5.2.50 5.2.49 5.2.48 5.2.47 5.2.46 5.2.45 5.2.44 5.2.43 5.2.42 5.2.41 5.2.40 5.2.39 5.2.38 5.2.37 5.2.36 5.2.35 5.2.34 5.2.33 5.2.32 5.2.31 5.2.30 5.2.29 5.2.28 5.2.27 5.2.26 5.2.25 5.2.24 5.2.23 5.2.22 5.2.21 5.2.20 5.2.19 5.2.18 5.2.17 5.2.16 5.2.15 5.2.14 5.2.13 5.2.12 5.2.11 5.2.10 5.2.9 5.2.8 5.2.7 5.2.6 5.2.5 5.2.4 5.2.3 5.2.2 5.2.1 5.2.0 5.2.0-beta
1 merge request!3080Fix configuration propagation to liblinphone
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 5 deletions
CMakeLists.txt
+ 1
− 1
View file @ 16283c62
......@@ -20,7 +20,7 @@
cmake_minimum_required(VERSION 3.2)
project(linphone-sdk VERSION 5.2.0 LANGUAGES NONE)
project(linphone-sdk VERSION 5.2.0 LANGUAGES CXX)#Set CXX language to get compiler type while configuring
set(LINPHONESDK_DIR "${CMAKE_CURRENT_LIST_DIR}")
......
cmake-builder @ c9ac5671
Compare 4da0980d...c9ac5671
Subproject commit 4da0980df0bf0b4f67549971c45614777084f594
Subproject commit c9ac567176a3b899f2b711e4c72b7547d69fd2a2
zxing-cpp @ 20505200
Compare 3ce0f1c7...20505200
Subproject commit 3ce0f1c710c9ae1ed7dc5d2d41f39a4c33a85938
Subproject commit 2050520071cb798a1712d4d6f43e45ab94550660
liblinphone @ 98d8258c
Compare ed863670...98d8258c
Subproject commit ed863670e856946363f1ccf81ec6a66ac6d68c66
Subproject commit 98d8258c8a01b1d19f0a6d93317fdc92a2a97332
mediastreamer2 @ a0e297b8
Compare c2274709...a0e297b8
Subproject commit c227470928b7761da7ea38ad523ad22e0cdb1aa4
Subproject commit a0e297b85f40cf1eb28915d389483695f521bf43
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment