mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-01-17 11:28:07 +00:00
Force architecture to LINPHONESDK_MACOS_ARCHS if x86_64.
This way, only x86_64 will be build on arm64 device. Fix qml syntax.
This commit is contained in:
parent
1bacea1f11
commit
94ea043ac6
1 changed files with 4 additions and 2 deletions
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue