From 94ea043ac65d15c0898ebb38b0614b2afd4c8f21 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Tue, 11 Jul 2023 09:55:59 +0200 Subject: [PATCH] Force architecture to LINPHONESDK_MACOS_ARCHS if x86_64. This way, only x86_64 will be build on arm64 device. Fix qml syntax. --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a12d9bc4..d3102064a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,11 +43,14 @@ if( APPLE ) set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version") endif() if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64")# TODO: add universal build - set(LINPHONESDK_MACOS_ARCHS "arm64" CACHE STRING "MacOS architectures to build for: comma-separated list of values in [arm64]") + set(LINPHONESDK_MACOS_ARCHS "x86_64" CACHE STRING "MacOS architectures to build for: comma-separated list of values in [x86_64]") else() set(LINPHONESDK_MACOS_ARCHS "x86_64" CACHE STRING "MacOS architectures to build for: comma-separated list of values in [x86_64]") endif() set(CMAKE_OSX_ARCHITECTURES ${LINPHONESDK_MACOS_ARCHS} CACHE STRING "") + set(CMAKE_SYSTEM_PROCESSOR "x86_64") +elseif(WIN32) + set(LINPHONESDK_BUILD_TYPE "Default") endif() project(linphoneqt) @@ -144,7 +147,6 @@ if(NOT LINPHONE_QT_ONLY) set(QTKEYCHAIN_TARGET_NAME "EQt5Keychain") add_subdirectory("external/qtkeychain") endif() - endif() function(add_linphone_app)