From 4485a95c8cea6ba9b755be58e06326b638c99be8 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Thu, 1 Jun 2023 10:38:29 +0200
Subject: [PATCH] Attempt to fix macos and windows builds in CI.

---
 .gitlab-ci-files/job-macosx-desktop.yml  | 14 +++++++-------
 .gitlab-ci-files/job-windows-desktop.yml |  1 +
 CMakeLists.txt                           |  2 --
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci-files/job-macosx-desktop.yml b/.gitlab-ci-files/job-macosx-desktop.yml
index 94c7a509c..1aa43317f 100644
--- a/.gitlab-ci-files/job-macosx-desktop.yml
+++ b/.gitlab-ci-files/job-macosx-desktop.yml
@@ -6,7 +6,9 @@
 .build_all_script: &build_all_script |
   ccache -s
   export Qt5_DIR=~/Qt/$QT_MAC_VER/lib/cmake/Qt5
+  echo $Qt5_DIR
   export PATH=~/Qt/$QT_MAC_VER/bin:$PATH
+  echo $PATH
   if [ -d "build" ]; then rm -rf build; fi;
   mkdir -p build/OUTPUT
   cd build
@@ -16,7 +18,7 @@
   echo $DEFAULT_MACOS_CMAKE_OPTIONS
   echo $CMAKE_OPTIONS
   echo $ADDITIONAL_BUILD_OPTIONS
-  cmake .. -G "$CMAKE_GENERATOR" -DLINPHONESDK_PLATFORM=Desktop -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE $DEFAULT_MACOS_CMAKE_OPTIONS $XCODE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS -DLINPHONE_BUILDER_SIGNING_IDENTITY="$MACOS_SIGNING_IDENTITY" -DLINPHONESDK_MACOS_ARCHS="$LINPHONESDK_MACOS_ARCHS" -DLINPHONESDK_OPENSSL_ROOT_DIR_X86_64="$LINPHONESDK_OPENSSL_ROOT_DIR_X86_64" -DLINPHONESDK_OPENSSL_ROOT_DIR_ARM64="$LINPHONESDK_OPENSSL_ROOT_DIR_ARM64" $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 -DCMAKE_APPLE_SILICON_PROCESSOR=$CMAKE_APPLE_SILICON_PROCESSOR $RELEASE_FILE
   cmake --build . --target install --config $CI_BUILD_TYPE $LBC_NODEBUG_OPTIONS -- $ADDITIONAL_BUILD_OPTIONS
   ccache -s
 
@@ -26,9 +28,8 @@
   script:
     - *build_all_script
   variables:
-    LINPHONESDK_MACOS_ARCHS: "x86_64"
-    LINPHONESDK_OPENSSL_ROOT_DIR_X86_64: "/usr/local/opt/openssl@1.1"
-    LINPHONESDK_OPENSSL_ROOT_DIR_ARM64: "/opt/homebrew/opt/openssl@1.1"
+    CMAKE_TOOLCHAIN_FILE: linphone-sdk/cmake/toolchains/toolchain-mac-x86_64.cmake
+    CMAKE_APPLE_SILICON_PROCESSOR: x86_64
   artifacts:
     paths:
       - build/OUTPUT
@@ -68,7 +69,7 @@ job-macosx-ninja-novideo:
     variables:
       - $NIGHTLY_MASTER
   variables:
-    CMAKE_OPTIONS: -DENABLE_VIDEO=NO -DENABLE_PQCRYPTO=ON
+    CMAKE_OPTIONS: -DENABLE_VIDEO=OFF -DENABLE_PQCRYPTO=ON
     CMAKE_GENERATOR: Ninja
   extends: .job-macosx-desktop
 
@@ -98,9 +99,8 @@ job-macosx-makefile-package:
        - $PACKAGE_MACOSX
        - $DEPLOY_MACOSX
   variables:
-    CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES -DENABLE_G729=ON
+    CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=ON -DENABLE_GPL_THIRD_PARTIES=ON -DENABLE_G729=ON
     RELEASE_FILE: -DLINPHONE_SDK_MAKE_RELEASE_FILE_URL=$MAKE_RELEASE_FILE_URL/$MACOSX_PLATFORM/$APP_FOLDER
-    LINPHONESDK_MACOS_ARCHS: "x86_64"
   extends: job-macosx-makefile
   script:
     - if [[ $MAKE_RELEASE_FILE_URL == "" ]]; then export RELEASE_FILE=""; fi
diff --git a/.gitlab-ci-files/job-windows-desktop.yml b/.gitlab-ci-files/job-windows-desktop.yml
index c0b81ec0c..4c0ded14e 100644
--- a/.gitlab-ci-files/job-windows-desktop.yml
+++ b/.gitlab-ci-files/job-windows-desktop.yml
@@ -95,6 +95,7 @@
       - build-desktop\ninja_buildlog.txt
       - build-desktop\invertSearch.ps1
       - build-desktop\OUTPUT\*
+      - build-desktop\linphone-sdk\openh264-prefix\src\openh264-stamp\*
     when: always
     expire_in: 1 week
     
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1bd61baf5..2a12d9bc4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,8 +55,6 @@ project(linphoneqt)
 include(GNUInstallDirs)
 include(CheckCXXCompilerFlag)
 
-set(CMAKE_CXX_STANDARD 17)
-
 # Avoid cmake warning if CMP0071 is not set.
 if (POLICY CMP0071)
     cmake_policy(SET CMP0071 NEW)