Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-14 15:20:29 +02:00
Code Issues Releases Wiki Activity

Adds a workaround for Conan issue 8025, affecting libjpeg-turbo compilation on AppleSilicon Macs

Browse Source
This commit is contained in:
Dmitry Vedenko 2021-05-31 14:03:24 +03:00
parent ac55ef3a39
commit 1cd4bef4db
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake-proxies/cmake-modules/AudacityDependencies.cmake
View File

@ -211,9 +211,14 @@ function ( _conan_install build_type )
conan_cmake_autodetect(settings BUILD_TYPE ${build_type})
if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
# TODO: Read the target CPU architecture from the CMake option
# We have no AppleSilicon support yet
list( APPEND settings "arch=x86_64" )
list (APPEND settings "os.version=${CMAKE_OSX_DEPLOYMENT_TARGET}")
list( APPEND settings "os.version=${CMAKE_OSX_DEPLOYMENT_TARGET}" )
# This line is required to workaround the conan bug #8025
# https://github.com/conan-io/conan/issues/8025
# Without it, libjpeg-turbo will fail to cross-compile on AppleSilicon macs
list( APPEND settings ENV "CONAN_CMAKE_SYSTEM_PROCESSOR=x86_64")
endif()
if (build_type MATCHES "MinSizeRel|RelWithDebInfo")