diff --git a/validate_special_target.cmake b/validate_special_target.cmake index 37a5e87..50d2bf5 100644 --- a/validate_special_target.cmake +++ b/validate_special_target.cmake @@ -23,7 +23,9 @@ endfunction() if (NOT DESKTOP_APP_USE_PACKAGED) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12 CACHE STRING "Minimum macOS deployment version" FORCE) - set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "Target macOS architectures" FORCE) + if (NOT DEFINED CMAKE_OSX_ARCHITECTURES) + set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "Target macOS architectures" FORCE) + endif() endif() if (WIN32) diff --git a/variables.cmake b/variables.cmake index 3d317f4..43cf8fc 100644 --- a/variables.cmake +++ b/variables.cmake @@ -38,8 +38,8 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) set(CMAKE_POSITION_INDEPENDENT_CODE ON) endif() -if (APPLE) - if (DESKTOP_APP_USE_PACKAGED AND DEFINED CMAKE_OSX_ARCHITECTURES) +if (APPLE AND NOT DEFINED DESKTOP_APP_MAC_ARCH) + if (DEFINED CMAKE_OSX_ARCHITECTURES) set(DESKTOP_APP_MAC_ARCH "${CMAKE_OSX_ARCHITECTURES}" CACHE STRING "Target macOS arch.") else() set(DESKTOP_APP_MAC_ARCH "x86_64;arm64" CACHE STRING "Target macOS arch.")