From 3e2952b69b9f5f9e4332b74928948ccb207ce8de Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Fri, 29 Sep 2023 10:02:06 +0200 Subject: [PATCH] Fix some Apple build inconsistencies --- cmake/SfizzConfig.cmake | 2 +- external/st_audiofile/CMakeLists.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/SfizzConfig.cmake b/cmake/SfizzConfig.cmake index be2eb87c..ff0ab5eb 100644 --- a/cmake/SfizzConfig.cmake +++ b/cmake/SfizzConfig.cmake @@ -87,7 +87,7 @@ endif() if(NOT PROJECT_SYSTEM_PROCESSOR) if(MSVC) set(PROJECT_SYSTEM_PROCESSOR "${MSVC_CXX_ARCHITECTURE_ID}" CACHE STRING "" FORCE) - elseif(CMAKE_OSX_ARCHITECTURES) + elseif(APPLE AND CMAKE_OSX_ARCHITECTURES) set(PROJECT_SYSTEM_PROCESSOR "${CMAKE_OSX_ARCHITECTURES}" CACHE STRING "" FORCE) else() set(PROJECT_SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}" CACHE STRING "" FORCE) diff --git a/external/st_audiofile/CMakeLists.txt b/external/st_audiofile/CMakeLists.txt index fa327ef8..8ce6cfbd 100644 --- a/external/st_audiofile/CMakeLists.txt +++ b/external/st_audiofile/CMakeLists.txt @@ -29,6 +29,9 @@ set(WAVPACK_ENABLE_LIBCRYPTO OFF) set(WAVPACK_INSTALL_CMAKE_MODULE OFF) set(WAVPACK_INSTALL_DOCS OFF) set(WAVPACK_INSTALL_PKGCONFIG_MODULE OFF) +if(PROJECT_SYSTEM_PROCESSOR MATCHES "(arm.*)") + SET(WAVPACK_ENABLE_ASM OFF) +endif() add_subdirectory("thirdparty/wavpack" EXCLUDE_FROM_ALL) target_link_libraries(st_audiofile_formats PUBLIC wavpack)