From c77907acc33470dd7845333b76442f1b347828ce Mon Sep 17 00:00:00 2001
From: Anthony Gauchy <anthony.gauchy@belledonne-communications.com>
Date: Tue, 16 Feb 2021 16:15:59 +0100
Subject: [PATCH] Update cmake scripts to force Python3
---
CMakeLists.txt | 2 +-
tester/account_creator_tester.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3ace93c2b..322432e3b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -186,7 +186,7 @@ if(ENABLE_LIME)
set(HAVE_LIME 1)
endif()
if(ENABLE_CXX_WRAPPER OR ENABLE_CSHARP_WRAPPER OR ENABLE_JAVA_WRAPPER OR ENABLE_SWIFT_WRAPPER OR ENABLE_DOC)
- find_package(PythonInterp REQUIRED)
+ find_package(PythonInterp 3 REQUIRED)
check_python_module(pystache)
check_python_module(six)
if(ENABLE_DOC)
diff --git a/tester/account_creator_tester.c b/tester/account_creator_tester.c
index 5abfd08eae..ff326ad505 100644
--- a/tester/account_creator_tester.c
+++ b/tester/account_creator_tester.c
@@ -354,8 +354,8 @@ static void account_creator_reset_cb_done(LinphoneAccountCreatorCbs *cbs) {
static void account_creator_cb(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status, const char* resp) {
LinphoneAccountCreatorCbs *cbs = linphone_account_creator_get_callbacks(creator);
- LinphoneAccountCreatorStatus expected_status = (LinphoneAccountCreatorStatus)linphone_account_creator_service_get_user_data(
- linphone_account_creator_get_service(creator));
+ LinphoneAccountCreatorStatus expected_status = (LinphoneAccountCreatorStatus)((uintptr_t)linphone_account_creator_service_get_user_data(
+ linphone_account_creator_get_service(creator)));
BC_ASSERT_EQUAL(
status,
expected_status,
@@ -2137,8 +2137,8 @@ static void server_update_account_password_arg_new_password_missing(void) {
static void login_linphone_account_creator_cb(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status, const char* resp) {
LinphoneAccountCreatorCbs *cbs = linphone_account_creator_get_callbacks(creator);
- LinphoneAccountCreatorStatus expected_status = (LinphoneAccountCreatorStatus)linphone_account_creator_service_get_user_data(
- linphone_account_creator_get_service(creator));
+ LinphoneAccountCreatorStatus expected_status = (LinphoneAccountCreatorStatus)((uintptr_t)linphone_account_creator_service_get_user_data(
+ linphone_account_creator_get_service(creator)));
BC_ASSERT_EQUAL(
status,
expected_status,
--
GitLab