Fix some Apple build inconsistencies
This commit is contained in:
parent
afc6dbaa3b
commit
3e2952b69b
2 changed files with 4 additions and 1 deletions
|
|
@ -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)
|
||||
|
|
|
|||
3
external/st_audiofile/CMakeLists.txt
vendored
3
external/st_audiofile/CMakeLists.txt
vendored
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue